From 9847b8d1480f2fabf8e0148525abc7e4f184032a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 May 2014 16:16:23 +0200 Subject: [PATCH] haskell-mtl: update to version 2.2.0.1 --- .../development/libraries/haskell/mtl/2.2.0.1.nix | 15 +++++++++++++++ pkgs/top-level/haskell-defaults.nix | 2 ++ pkgs/top-level/haskell-packages.nix | 3 ++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/mtl/2.2.0.1.nix diff --git a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix new file mode 100644 index 00000000000..649ce516286 --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix @@ -0,0 +1,15 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "mtl"; + version = "2.2.0.1"; + sha256 = "0486cg4dp0p942zsg7yxpwn1jykx8p3gb794jaq0v3j44a7x00rb"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/mtl"; + description = "Monad classes, using functional dependencies"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index ff1db4c5ab8..72a328ad69e 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,6 +15,7 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { + mtl = self.mtl_2_1_3_1; }; ghc782Prefs = self : super : ghcHEADPrefs self super // { @@ -35,6 +36,7 @@ }; gloss = null; # requires base >= 4.7 haddock = self.haddock_2_13_2; + mtl = self.mtl_2_2_0_1; pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_0; }; transformers = self.transformers_0_4_1_0; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8df7cef6efa..98e7ee84d2a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1431,7 +1431,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {}; mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {}; mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {}; - mtl = self.mtl_2_1_3_1; + mtl_2_2_0_1 = callPackage ../development/libraries/haskell/mtl/2.2.0.1.nix {}; + mtl = null; # tightly coupled with 'transformers' which is a core package mtlparse = callPackage ../development/libraries/haskell/mtlparse {};