Author: simons
Date: Mon Sep 5 19:31:49 2011
New Revision: 29040
URL: https://svn.nixos.org/websvn/nix/?rev=29040&sc=1
Log:
haskell-ghc-paths: updated default version to 0.1.0.8 (and dropped obsolete
older versions)
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/default.nix
- copied, changed from r29039,
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.5.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/default.nix (from
r29039, nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-paths/0.1.0.8.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:31:42
2011 (r29039)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Sep 5 19:31:49
2011 (r29040)
@@ -580,10 +580,7 @@
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 @@
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 @@
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 {};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
