about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-12-21 10:48:57 +0000
committerPeter Simons <simons@cryp.to>2011-12-21 10:48:57 +0000
commit3f4358a02a0656f82e8cec62967f08958d8bbb73 (patch)
tree12251dfe0b8a13312d27a08cb19574d534662a1a
parented2a67d6d6e6097207f6269f0ec67355ec5c97fc (diff)
haskell-multirec: dropped obsolete version 0.5.1
svn path=/nixpkgs/trunk/; revision=30999
-rw-r--r--pkgs/development/libraries/haskell/multirec/0.5.1.nix18
-rw-r--r--pkgs/development/libraries/haskell/multirec/default.nix (renamed from pkgs/development/libraries/haskell/multirec/0.7.nix)0
-rw-r--r--pkgs/top-level/haskell-packages.nix8
3 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/development/libraries/haskell/multirec/0.5.1.nix b/pkgs/development/libraries/haskell/multirec/0.5.1.nix
deleted file mode 100644
index 3e994f878cc64..0000000000000
--- a/pkgs/development/libraries/haskell/multirec/0.5.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multirec";
-  version = "0.5.1";
-  sha256 = "0y62gb2ml0799a3f1ny5ydjc4rjwj1dgs48f5fj6hf2fpl4hk02l";
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
-    description = "Generic programming for families of recursive datatypes";
-    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/multirec/0.7.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index e5a1b2a85a96a..e5a1b2a85a96a 100644
--- a/pkgs/development/libraries/haskell/multirec/0.7.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index df176735967d8..82c713868b03c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -949,9 +949,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   multiplate = callPackage ../development/libraries/haskell/multiplate {};
 
-  multirec_0_5_1 = callPackage ../development/libraries/haskell/multirec/0.5.1.nix {};
-  multirec_0_7 = callPackage ../development/libraries/haskell/multirec/0.7.nix {};
-  multirec = self.multirec_0_7;
+  multirec = callPackage ../development/libraries/haskell/multirec {};
 
   multiset = callPackage ../development/libraries/haskell/multiset {};
 
@@ -1415,9 +1413,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
 
-  zipper = callPackage ../development/libraries/haskell/zipper {
-    multirec = self.multirec_0_5_1;
-  };
+  zipper = callPackage ../development/libraries/haskell/zipper {};
 
   zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix {
     inherit (pkgs) zlib;