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
This commit is contained in:
Peter Simons 2011-12-05 16:23:02 +00:00
parent c39d60bc0e
commit 42757e653a
3 changed files with 17 additions and 1 deletions

View File

@ -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 {

View File

@ -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;
};
})

View File

@ -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 {};