From 42757e653a428b2a9d3886688ad12994900c22d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:23:02 +0000 Subject: [PATCH] Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes out that supports the current version. svn path=/nixpkgs/trunk/; revision=30761 --- .../version-management/git-and-tools/default.nix | 3 ++- .../libraries/haskell/monad-control/0.2.0.3.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3f1593899c1..0f14c35a3df 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,8 +48,9 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl hS3 mtl network hslogger hxt json; + HTTP testpack hS3 mtl network hslogger hxt json; QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; + monadControl = haskellPackages.monadControl_OBSOLETE; }; qgit = import ./qgit { diff --git a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix new file mode 100644 index 00000000000..f1107c12af5 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix @@ -0,0 +1,14 @@ +{ cabal, baseUnicodeSymbols, transformers }: + +cabal.mkDerivation (self: { + pname = "monad-control"; + version = "0.2.0.3"; + sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh"; + buildDepends = [ baseUnicodeSymbols transformers ]; + meta = { + homepage = "https://github.com/basvandijk/monad-control/"; + description = "Lift control operations, like exception catching, through monad transformers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8a4d083f708..f6b8cd2b76b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -862,6 +862,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {}; + monadControl_OBSOLETE = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {}; monadControl = callPackage ../development/libraries/haskell/monad-control {}; monadLoops = callPackage ../development/libraries/haskell/monad-loops {};