Fixed priority settings for GHCs; some minor fixes.

svn path=/nixpkgs/trunk/; revision=28450

pkgs/development/libraries/haskell/hfuse/default.nix

@@ -5,6 +5,11 @@ cabal.mkDerivation (self: {
   version = "0.2.4";
   sha256 = "1v3kfkm2rz7bvwk0j8p9rhnnsffbnkismnsq0fkgnzi5z0bz5sgv";
   extraLibraries = [ fuse ];
+
+  preConfigure = ''
+    sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
+  '';
+
   meta = {
     homepage = "https://github.com/realdesktop/hfuse";
     description = "HFuse is a binding for the Linux FUSE library.";

pkgs/top-level/all-packages.nix

@@ -2102,18 +2102,42 @@ let
     haskellPackagesFun ../development/compilers/ghc/7.0.3.nix
       ghc6101Binary (x : x.ghc703Prefs) false false lowPrio;
 
-  # Current default version.
+  # Current default version: 7.0.4
   # Note that the platform isn't officially released for ghc-7.0.4, but
   # it works without problems.
+
+  # The following items are a bit convoluted, but they serve the
+  # following purpose:
+  #   - for the default version of GHC, both profiling and
+  #     non-profiling versions should be built by Hydra --
+  #     therefore, the _no_profiling and _profiling calls;
+  #   - however, if a user just upgrades a profile, then the
+  #     cabal/libraryProfiling setting should be respected; i.e.,
+  #     the versions not matching the profiling config setting
+  #     should have low priority -- therefore, the use of
+  #     haskellDefaultVersionPrioFun;
+  #   - it should be possible to select library versions that
+  #     respect the config setting using the standard
+  #     haskellPackages_ghc704 path -- therefore, the additional
+  #     call in haskellPackages_ghc704, without recurseIntoAttrs,
+  #     so that Hydra doesn't build these.
+  haskellDefaultVersionPrioFun =
+    profDefault :
+    if getConfig [ "cabal" "libraryProfiling" ] false == profDefault
+      then (x : x)
+      else lowPrio;
+
   haskellPackages_ghc704_no_profiling =
     recurseIntoAttrs
       (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix
-        ghc6101Binary (x : x.ghc704Prefs) true false (x : x));
+        ghc6101Binary (x : x.ghc704Prefs) true false
+        (haskellDefaultVersionPrioFun false));
 
   haskellPackages_ghc704_profiling =
     recurseIntoAttrs
       (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix
-        ghc6101Binary (x : x.ghc704Prefs) true true lowPrio);
+        ghc6101Binary (x : x.ghc704Prefs) true true
+        (haskellDefaultVersionPrioFun true));
 
   haskellPackages_ghc704 =
     haskellPackagesFun ../development/compilers/ghc/7.0.4.nix

pkgs/top-level/haskell-packages.nix

@@ -1132,7 +1132,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   testFrameworkHUnit = callPackage ../development/libraries/haskell/test-framework-hunit {};
 
-  testFrameworkQuickCheck = callPackage ../development/libraries/haskell/test-framework-quickcheck {};
+  testFrameworkQuickCheck = callPackage ../development/libraries/haskell/test-framework-quickcheck {
+    QuickCheck = self.QuickCheck1;
+  };
 
   testFrameworkQuickCheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {};