Author: andres
Date: Wed Aug 10 07:27:23 2011
New Revision: 28450
URL: https://svn.nixos.org/websvn/nix/?rev=28450&sc=1
Log:
Fixed priority settings for GHCs; some minor fixes.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hfuse/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hfuse/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hfuse/default.nix Wed Aug
10 00:35:08 2011 (r28449)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hfuse/default.nix Wed Aug
10 07:27:23 2011 (r28450)
@@ -5,6 +5,11 @@
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.";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 10 00:35:08
2011 (r28449)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 10 07:27:23
2011 (r28450)
@@ -2102,18 +2102,42 @@
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
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Aug 10 00:35:08
2011 (r28449)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Aug 10 07:27:23
2011 (r28450)
@@ -1132,7 +1132,9 @@
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 {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
