Author: simons
Date: Tue Aug  9 14:32:20 2011
New Revision: 28433
URL: https://svn.nixos.org/websvn/nix/?rev=28433&sc=1

Log:
all-packages.nix: register all haskellPackage variants except the default one, 
7.0.4, with low priority

Some general purpose tools in haskell-packages.nix have no GHC version string
baked in their name, i.e. alex, haddock, and happy. "nix-env -u" prefers the
first match it finds. Thus, if haskellPackages_ghc6104 et al would have the
same priority as haskellPackages, then nix-env would choose those the old
variants of these tools, because they are listed first.

Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Tue Aug  9 14:15:16 
2011        (r28432)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Tue Aug  9 14:32:20 
2011        (r28433)
@@ -2074,20 +2074,20 @@
   haskellPackages_ghc6104 =
     recurseIntoAttrs
       (haskellPackagesFun ../development/compilers/ghc/6.10.4.nix
-        ghc6101Binary (x : x.ghc6104Prefs) false false (x : x));
+        ghc6101Binary (x : x.ghc6104Prefs) false false lowPrio);
 
   haskellPackages_ghc6121 =
     haskellPackagesFun ../development/compilers/ghc/6.12.1.nix
-      ghc6101Binary (x : x.ghc6121Prefs) false false (x : x);
+      ghc6101Binary (x : x.ghc6121Prefs) false false lowPrio;
 
   haskellPackages_ghc6122 =
     haskellPackagesFun ../development/compilers/ghc/6.12.2.nix
-      ghc6101Binary (x : x.ghc6122Prefs) false false (x : x);
+      ghc6101Binary (x : x.ghc6122Prefs) false false lowPrio;
 
   haskellPackages_ghc6123 =
     recurseIntoAttrs
       (haskellPackagesFun ../development/compilers/ghc/6.12.3.nix
-        ghc6101Binary (x : x.ghc6123Prefs) false false (x : x));
+        ghc6101Binary (x : x.ghc6123Prefs) false false lowPrio);
 
   # Will never make it into a platform release, severe bugs; leave at lowPrio.
   haskellPackages_ghc701 =
@@ -2096,11 +2096,11 @@
 
   haskellPackages_ghc702 =
     haskellPackagesFun ../development/compilers/ghc/7.0.2.nix
-      ghc6101Binary (x : x.ghc702Prefs) false false (x : x);
+      ghc6101Binary (x : x.ghc702Prefs) false false lowPrio;
 
   haskellPackages_ghc703 =
     haskellPackagesFun ../development/compilers/ghc/7.0.3.nix
-      ghc6101Binary (x : x.ghc703Prefs) false false (x : x);
+      ghc6101Binary (x : x.ghc703Prefs) false false lowPrio;
 
   # Current default version.
   # Note that the platform isn't officially released for ghc-7.0.4, but
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to