From c9a52836c83d8e455092e0a1e210f59aec22c077 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:18:54 +0100 Subject: [PATCH] haskell-pretty-show: resurrect version 1.2, which is required to build hledger on old versions of GHC This reverts commit 54bfef6fc3d88eabfbd17c440c906170f7bc00ef. --- .../libraries/haskell/pretty-show/1.2.nix | 16 ++++++++++++++++ .../pretty-show/{default.nix => 1.6.2.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix rename pkgs/development/libraries/haskell/pretty-show/{default.nix => 1.6.2.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix new file mode 100644 index 00000000000..545816a57a0 --- /dev/null +++ b/pkgs/development/libraries/haskell/pretty-show/1.2.nix @@ -0,0 +1,16 @@ +{ 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/default.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/pretty-show/default.nix rename to pkgs/development/libraries/haskell/pretty-show/1.6.2.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e8e5c741ba..5e4488add3f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1772,9 +1772,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow = callPackage ../development/libraries/haskell/pretty-show { + 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 { happy = self.happy_1_19_2; }; + prettyShow = self.prettyShow_1_6_2; punycode = callPackage ../development/libraries/haskell/punycode {};