From 47e76fde881e1fcf0c244e8b1753deddb480f82d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Mar 2012 20:50:18 +0000 Subject: [PATCH] haskell-unordered-containers: added version 0.1.4.6 again to fix build of snap-core svn path=/nixpkgs/trunk/; revision=32911 --- .../haskell/unordered-containers/0.1.4.6.nix | 17 +++++++++++++++++ .../{default.nix => 0.2.0.0.nix} | 0 pkgs/top-level/haskell-packages.nix | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix rename pkgs/development/libraries/haskell/unordered-containers/{default.nix => 0.2.0.0.nix} (100%) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix b/pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix new file mode 100644 index 00000000000..da4616a1367 --- /dev/null +++ b/pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq, hashable }: + +cabal.mkDerivation (self: { + pname = "unordered-containers"; + version = "0.1.4.6"; + sha256 = "1azwxbrzlzaw54idp3z2xx1xlywzsf1r893blbz51nnwcj9v550d"; + buildDepends = [ deepseq hashable ]; + meta = { + description = "Efficient hashing-based container types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.0.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/unordered-containers/default.nix rename to pkgs/development/libraries/haskell/unordered-containers/0.2.0.0.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6948672936c..029c8b1dbd3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1221,6 +1221,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); snapCore = callPackage ../development/libraries/haskell/snap/core.nix { mwcRandom = self.mwcRandom_0_10_0_1; + unorderedContainers = self.unorderedContainers_0_1_4_6; }; snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; @@ -1380,7 +1381,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; - unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; + unorderedContainers_0_1_4_6 = callPackage ../development/libraries/haskell/unordered-containers/0.1.4.6.nix {}; + unorderedContainers_0_2_0_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.0.0.nix {}; + unorderedContainers = self.unorderedContainers_0_2_0_0; url = callPackage ../development/libraries/haskell/url {};