From 64ff17d4e648153c2fd7b9ed94d28cec7f89e5f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:38:32 +0100 Subject: [PATCH] haskell-zlib: drop obsolete versions 0.5.0.0, 0.5.2.0, 0.5.3.1, 0.5.3.3, and 0.5.4.0 --- .../libraries/haskell/zlib/0.5.0.0.nix | 16 ---------------- .../libraries/haskell/zlib/0.5.2.0.nix | 16 ---------------- .../libraries/haskell/zlib/0.5.3.1.nix | 16 ---------------- .../libraries/haskell/zlib/0.5.3.3.nix | 17 ----------------- .../libraries/haskell/zlib/0.5.4.0.nix | 16 ---------------- .../haskell/zlib/{0.5.4.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 +------- 7 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.2.0.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.1.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.3.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.4.0.nix rename pkgs/development/libraries/haskell/zlib/{0.5.4.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix deleted file mode 100644 index b67604821293..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.0.0"; - sha256 = "20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix deleted file mode 100644 index f3669c97c0a8..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.2.0"; - sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix deleted file mode 100644 index 1bed95bc2e82..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.3.1"; - sha256 = "1hj56lk4g2zr7acdda39zib1bj02777q0asm5ms9rfj7kp81caiq"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix deleted file mode 100644 index 5260b55a0277..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.3.3"; - sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; - extraLibraries = [ zlib ]; - jailbreak = true; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix deleted file mode 100644 index 8b13da93ce34..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.4.0"; - sha256 = "18hc4wr8brzbl9qapjbjyb9kyqrznv2xbw7rv1a6k8i3392ilxv1"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/zlib/0.5.4.1.nix rename to pkgs/development/libraries/haskell/zlib/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f57129c3f5b5..42d6a9575638 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2867,13 +2867,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zippers = callPackage ../development/libraries/haskell/zippers {}; - zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; - zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_4_1 = callPackage ../development/libraries/haskell/zlib/0.5.4.1.nix { inherit (pkgs) zlib;}; - zlib = self.zlib_0_5_4_1; + zlib = callPackage ../development/libraries/haskell/zlib { inherit (pkgs) zlib;}; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};