From b1277cea392b23bd4daa95e7fbfc0d4a85fb9c34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 19:31:49 +0000 Subject: [PATCH] haskell-ghc-paths: updated default version to 0.1.0.8 (and dropped obsolete older versions) svn path=/nixpkgs/trunk/; revision=29040 --- .../libraries/haskell/ghc-paths/0.1.0.5.nix | 16 ---------------- .../libraries/haskell/ghc-paths/0.1.0.6.nix | 16 ---------------- .../ghc-paths/{0.1.0.8.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 17 ++++------------- 4 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix delete mode 100644 pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix rename pkgs/development/libraries/haskell/ghc-paths/{0.1.0.8.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix deleted file mode 100644 index cd295e3476f0..000000000000 --- a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "ghc-paths"; - version = "0.1.0.5"; - sha256 = "ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10"; - meta = { - description = "Knowledge of GHC's installation directories"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix deleted file mode 100644 index ae280fa54ea6..000000000000 --- a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "ghc-paths"; - version = "0.1.0.6"; - sha256 = "95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243"; - meta = { - description = "Knowledge of GHC's installation directories"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix rename to pkgs/development/libraries/haskell/ghc-paths/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1e8c60b8220a..4d1cef4d506e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -580,10 +580,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; - ghcPaths_0_1_0_5 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.5.nix {}; - ghcPaths_0_1_0_6 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {}; - ghcPaths_0_1_0_8 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.8.nix {}; - ghcPaths = self.ghcPaths_0_1_0_6; # version 0.1.0.5 doesn't build with an up-to-date GHC + ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {}; ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {}; @@ -1171,9 +1168,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uuParsingLib = callPackage ../development/libraries/haskell/uu-parsinglib {}; - vacuum = callPackage ../development/libraries/haskell/vacuum { - ghcPaths = self.ghcPaths_0_1_0_6; - }; + vacuum = callPackage ../development/libraries/haskell/vacuum {}; vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {}; @@ -1323,12 +1318,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); frown = callPackage ../development/tools/parsing/frown {}; haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; - haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { - ghcPaths = self.ghcPaths_0_1_0_6; - }; - haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix { - ghcPaths = self.ghcPaths_0_1_0_6; - }; + haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; + haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; haddock = self.haddock_2_7_2; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};