about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-05-15 19:58:36 +0200
committerPeter Simons <simons@cryp.to>2014-05-16 18:51:38 +0200
commit14958391df931b605c2093881af6fd7ef79ce458 (patch)
tree49b9ef71631d958938742a9fc10c83e72a7309c8
parent8baf727bad4252923b643177e04b4b0292e798d1 (diff)
haskell-multiset: drop obsolete version 0.2.1
-rw-r--r--pkgs/development/libraries/haskell/multiset/0.2.1.nix13
-rw-r--r--pkgs/development/libraries/haskell/multiset/default.nix (renamed from pkgs/development/libraries/haskell/multiset/0.2.2.nix)0
-rw-r--r--pkgs/top-level/haskell-packages.nix4
3 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/development/libraries/haskell/multiset/0.2.1.nix b/pkgs/development/libraries/haskell/multiset/0.2.1.nix
deleted file mode 100644
index 9f85317505c90..0000000000000
--- a/pkgs/development/libraries/haskell/multiset/0.2.1.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multiset";
-  version = "0.2.1";
-  sha256 = "0snlm6s9ikf5gngdwb7rm7v6017f5bffajv6777y56pjmd7bk9sy";
-  meta = {
-    description = "The Data.MultiSet container type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multiset/0.2.2.nix b/pkgs/development/libraries/haskell/multiset/default.nix
index 16fcf155747d7..16fcf155747d7 100644
--- a/pkgs/development/libraries/haskell/multiset/0.2.2.nix
+++ b/pkgs/development/libraries/haskell/multiset/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8aa4ac59de358..3da37133dc69c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1446,9 +1446,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   multirec = callPackage ../development/libraries/haskell/multirec {};
 
-  multiset_0_2_1 = callPackage ../development/libraries/haskell/multiset/0.2.1.nix {};
-  multiset_0_2_2 = callPackage ../development/libraries/haskell/multiset/0.2.2.nix {};
-  multiset = self.multiset_0_2_2;
+  multiset = callPackage ../development/libraries/haskell/multiset {};
 
   murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};