diff --git a/config.nix b/config.nix new file mode 100644 index 00000000..d03d2df4 --- /dev/null +++ b/config.nix @@ -0,0 +1,7 @@ +{ + packageOverrides = pkgs: rec { + haskellPackages = with pkgs.haskellPackages; pkgs.haskellPackages // rec { + errors = callPackage ./errors.nix {}; + }; + }; +} diff --git a/default.nix b/default.nix index 4b4c3c4b..6a5cb78d 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,7 @@ { mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring , case-insensitive, cereal, conduit, conduit-extra, containers -, cryptohash, data-default, directory, errors-1_4_7, filepath +, cryptohash, data-default, directory, errors, filepath , http-client, http-conduit, http-types, lifted-base, monad-control , mtl, network, old-locale, QuickCheck, quickcheck-instances , resourcet, safe, scientific, stdenv, tagged, tasty @@ -23,11 +23,10 @@ mkDerivation { unordered-containers utf8-string vector xml-conduit ]; testDepends = [ - aeson base bytestring errors-1_4_7 http-client lifted-base monad-control + aeson base bytestring errors http-client lifted-base monad-control mtl QuickCheck quickcheck-instances resourcet tagged tasty tasty-quickcheck text time transformers transformers-base ]; - jailbreak = true; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; diff --git a/errors.nix b/errors.nix new file mode 100644 index 00000000..af02b1ec --- /dev/null +++ b/errors.nix @@ -0,0 +1,9 @@ +{ mkDerivation, base, either, safe, stdenv, transformers }: +mkDerivation { + pname = "errors"; + version = "1.4.7"; + sha256 = "09g53dylwsw1phxq5zhkbq8pnpwqzipvqclmcrdypzkpwkmfncl7"; + buildDepends = [ base either safe transformers ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; +}