Author: simons
Date: Mon Dec 5 16:23:02 2011
New Revision: 30761
URL: https://nixos.org/websvn/nix/?rev=30761&sc=1
Log:
Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes
out that supports the current version.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Mon Dec 5 16:22:59 2011 (r30760)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Mon Dec 5 16:23:02 2011 (r30761)
@@ -48,8 +48,9 @@
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 {
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
Mon Dec 5 16:23:02 2011 (r30761)
@@ -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;
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Dec 5 16:22:59
2011 (r30760)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Dec 5 16:23:02
2011 (r30761)
@@ -862,6 +862,7 @@
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 {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
