From 37d68e69a0803050450a70d0bd6e5fba57cb5c85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:02 +0100 Subject: [PATCH] haskell-pretty-show: remove obsolete version 1.2 --- .../libraries/haskell/pretty-show/1.2.nix | 16 ---------------- .../pretty-show/{1.6.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix rename pkgs/development/libraries/haskell/pretty-show/{1.6.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix deleted file mode 100644 index 545816a57a0..00000000000 --- a/pkgs/development/libraries/haskell/pretty-show/1.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, haskellLexer }: - -cabal.mkDerivation (self: { - pname = "pretty-show"; - version = "1.2"; - sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; - isLibrary = true; - isExecutable = true; - buildDepends = [ haskellLexer ]; - meta = { - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived Show instances"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/pretty-show/1.6.2.nix rename to pkgs/development/libraries/haskell/pretty-show/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f7f2bd9d03b..f34386fa180 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1771,9 +1771,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {}; - prettyShow = self.prettyShow_1_6_2; + prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; punycode = callPackage ../development/libraries/haskell/punycode {};