From c6edd9a278771858ade2ee05c525bde17f910d9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 7 Aug 2011 20:24:54 +0000 Subject: [PATCH] haskell-monads-fd: added new version 0.2.0.0 Unfortunately, the old version no longer compiles because it can't deal with current versions of the transformers package. This means that some other packages that depend on the old monads-fd package, such as MaybeT-transformers, are broken, too. svn path=/nixpkgs/trunk/; revision=28278 --- .../libraries/haskell/monads-fd/0.0.0.1.nix | 14 ++++++++++++++ .../haskell/monads-fd/{default.nix => 0.2.0.0.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix rename pkgs/development/libraries/haskell/monads-fd/{default.nix => 0.2.0.0.nix} (100%) diff --git a/pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix b/pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix new file mode 100644 index 000000000000..e2981063135c --- /dev/null +++ b/pkgs/development/libraries/haskell/monads-fd/0.0.0.1.nix @@ -0,0 +1,14 @@ +{cabal, transformers}: + +cabal.mkDerivation (self : { + pname = "monads-fd"; + version = "0.0.0.1"; + sha256 = "7eaac97b2c91a670171f18ebeb3f73b1a45e16576851279f73ea2e1f5ec63b25"; + propagatedBuildInputs = [transformers]; + meta = { + description = "Monad classes, using functional dependencies"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/monads-fd/default.nix b/pkgs/development/libraries/haskell/monads-fd/0.2.0.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/monads-fd/default.nix rename to pkgs/development/libraries/haskell/monads-fd/0.2.0.0.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index afd7f274bf91..adecf4ab89ea 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -747,7 +747,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; - MaybeTTransformers = callPackage ../development/libraries/haskell/MaybeT-transformers {}; + MaybeTTransformers = callPackage ../development/libraries/haskell/MaybeT-transformers { + monadsFd = self.monadsFd_0_0_0_1; + }; MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {}; @@ -773,7 +775,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {}; - monadsFd = callPackage ../development/libraries/haskell/monads-fd {}; + monadsFd_0_0_0_1 = callPackage ../development/libraries/haskell/monads-fd/0.0.0.1.nix {}; + monadsFd_0_2_0_0 = callPackage ../development/libraries/haskell/monads-fd/0.2.0.0.nix {}; + monadsFd = self.monadsFd_0_2_0_0; mpppc = callPackage ../development/libraries/haskell/mpppc {};