From e612537df9c1b449c84a77d95df7af3af041a3a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:17:21 +0100 Subject: [PATCH] haskell-regex-base: drop obsolete versions 0.72.0.2 and 0.93.1 --- .../libraries/haskell/regex-base/0.72.0.2.nix | 16 ---------------- .../libraries/haskell/regex-base/0.93.1.nix | 17 ----------------- .../regex-base/{0.93.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 5 +---- 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/regex-base/0.93.1.nix rename pkgs/development/libraries/haskell/regex-base/{0.93.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix deleted file mode 100644 index b5b7068da01..00000000000 --- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "regex-base"; - version = "0.72.0.2"; - sha256 = "38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee"; - 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-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix deleted file mode 100644 index 5aa971ac347..00000000000 --- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "regex-base"; - version = "0.93.1"; - sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef"; - buildDepends = [ mtl ]; - 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-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-base/0.93.2.nix rename to pkgs/development/libraries/haskell/regex-base/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d63dcb7c285..dd4d32e28db 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2073,10 +2073,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {}; - regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {}; - regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {}; - regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {}; - regexBase = self.regexBase_0_93_2; + 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 {};