From cbc39a26f7fa610ed65869bc2374524ff3dabfc9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:18:37 +0100 Subject: [PATCH] haskell-regex-compat: drop obsolete versions 0.71.0.1, 0.92, 0.93.1 --- .../libraries/haskell/regex-compat/0.71.0.1.nix | 17 ----------------- .../libraries/haskell/regex-compat/0.92.nix | 17 ----------------- .../libraries/haskell/regex-compat/0.93.1.nix | 17 ----------------- .../regex-compat/{0.95.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/regex-compat/0.92.nix delete mode 100644 pkgs/development/libraries/haskell/regex-compat/0.93.1.nix rename pkgs/development/libraries/haskell/regex-compat/{0.95.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix deleted file mode 100644 index 306d603a9cb..00000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.71.0.1"; - sha256 = "904552f7d690686b2602f37494827d09b09fc0a8a2565522b61847bec8d1de8d"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix deleted file mode 100644 index 91dda463e6d..00000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.92"; - sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix deleted file mode 100644 index 7fddc11a672..00000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.93.1"; - sha256 = "1zlsx7a2iz5gmgrwzr6w5fz6s4ayab5bm71xlq28r3iph3vp80zf"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-compat/0.95.1.nix rename to pkgs/development/libraries/haskell/regex-compat/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dd4d32e28db..ee2aa19e773 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2075,11 +2075,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexBase = callPackage ../development/libraries/haskell/regex-base {}; - regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; - regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; - regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {}; - regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {}; - regexCompat = self.regexCompat_0_95_1; + regexCompat = callPackage ../development/libraries/haskell/regex-compat {}; regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {};