From cba5d36df1649d028bb6d6265c0ec90989147dfa Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Mar 2014 20:04:04 +0100 Subject: [PATCH] haskell-parsers: remove old versions --- .../libraries/haskell/parsers/0.9.nix | 17 ----------------- .../haskell/parsers/{0.10.3.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/parsers/0.9.nix rename pkgs/development/libraries/haskell/parsers/{0.10.3.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/parsers/0.9.nix b/pkgs/development/libraries/haskell/parsers/0.9.nix deleted file mode 100644 index dc42228df66a..000000000000 --- a/pkgs/development/libraries/haskell/parsers/0.9.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, charset, doctest, filepath, text, transformers -, unorderedContainers -}: - -cabal.mkDerivation (self: { - pname = "parsers"; - version = "0.9"; - sha256 = "04lbayvdv2hax4s9sqlnia7jpzv1sgls41ylql0xbi2zhz5rvyyi"; - buildDepends = [ charset text transformers unorderedContainers ]; - testDepends = [ doctest filepath ]; - meta = { - homepage = "http://github.com/ekmett/parsers/"; - description = "Parsing combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsers/0.10.3.nix b/pkgs/development/libraries/haskell/parsers/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/parsers/0.10.3.nix rename to pkgs/development/libraries/haskell/parsers/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 539564f94c39..b35e1714226e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1880,9 +1880,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec3 = self.parsec_3_1_5; parsec = self.parsec3; - parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; - parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers = self.parsers_0_10_3; + parsers = callPackage ../development/libraries/haskell/parsers {}; parsimony = callPackage ../development/libraries/haskell/parsimony {};