From c2e47bbb6dc675f0c10a1e0193689c8e98a5fdde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:16:31 +0100 Subject: [PATCH] haskell-hashable: drop obsolete version 1.1.2.5 --- .../libraries/haskell/hashable/1.1.2.5.nix | 22 ------------------- .../hashable/{1.2.2.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/hashable/1.1.2.5.nix rename pkgs/development/libraries/haskell/hashable/{1.2.2.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix deleted file mode 100644 index 3c8330e82ae..00000000000 --- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, QuickCheck, random, testFramework -, testFrameworkQuickcheck2, text -}: - -cabal.mkDerivation (self: { - pname = "hashable"; - version = "1.1.2.5"; - sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z"; - buildDepends = [ text ]; - testDepends = [ - QuickCheck random testFramework testFrameworkQuickcheck2 text - ]; - meta = { - homepage = "http://github.com/tibbe/hashable"; - description = "A class for types that can be converted to a hash value"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix b/pkgs/development/libraries/haskell/hashable/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/hashable/1.2.2.0.nix rename to pkgs/development/libraries/haskell/hashable/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 147bac24074..0e4578806de 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1054,9 +1054,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in happstackFastCGI = callPackage ../development/libraries/haskell/happstack/happstack-fastcgi.nix {}; - hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_2_0 = callPackage ../development/libraries/haskell/hashable/1.2.2.0.nix {}; - hashable = self.hashable_1_2_2_0; + hashable = callPackage ../development/libraries/haskell/hashable {}; hashableExtras = callPackage ../development/libraries/haskell/hashable-extras {};