dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fixed priority settings for GHCs; some minor fixes.

Browse Source 
svn path=/nixpkgs/trunk/; revision=28450
This commit is contained in:
Andres Löh 2011-08-10 07:27:23 +00:00
parent b1ef3e6e36
commit 88feca4ee8
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/haskell/hfuse/default.nix
View File

@ -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.";

30
pkgs/top-level/all-packages.nix
View File

@ -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

4
pkgs/top-level/haskell-packages.nix
View File

@ -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 {};