From 2044c13947eb3aafc081f685d6ca3f7efc4295dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jul 2014 16:41:59 +0200 Subject: [PATCH] Revert "pretty: new haskell package" This reverts commit 51dc75b7692ce41527685507ea7f6f5dc2cb6ec5. The pretty library is a core package since (at least) GHC 6.10.4, i.e. every single one of our compilers ships this library by default. Adding the package to the global namespace like this is almost certainly going to cause trouble because we'll end up with inconsistently linked binaries whenever packages mix the user-space pretty library with the core one. --- .../libraries/haskell/pretty/default.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pretty/default.nix diff --git a/pkgs/development/libraries/haskell/pretty/default.nix b/pkgs/development/libraries/haskell/pretty/default.nix deleted file mode 100644 index 93945edf264..00000000000 --- a/pkgs/development/libraries/haskell/pretty/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "pretty"; - version = "1.1.1.1"; - sha256 = "1rjpqa4grhamzn5s9xg4w16cz2dpkn7ii9bpqy8lg4fiwppvg2kb"; - - doCheck = false; - - meta = { - description = "Pretty printing library especially useful for compilers and related tools"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4bf17c45de5..0b512a7c086 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1792,8 +1792,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in presburger = callPackage ../development/libraries/haskell/presburger {}; - pretty = callPackage ../development/libraries/haskell/pretty {}; - prettyclass = callPackage ../development/libraries/haskell/prettyclass {}; prettyShow = callPackage ../development/libraries/haskell/pretty-show {};