public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated lhs2TeX.

Browse Source 
* Propagated build inputs of Haskell pkgs are now automatically
  propagated user-env pkgs.
* Updated haskell-platform slightly.

svn path=/nixpkgs/trunk/; revision=15184
This commit is contained in:
Andres Löh
2009-04-20 14:23:50 +00:00
parent ff894ae773
commit 035d7cb965
4 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/haskell/cabal/cabal.nix
View File

@@ -54,7 +54,7 @@ attrs :
for i in Setup.hs Setup.lhs; do
test -f $i && ghc --make $i
done
./Setup configure --verbose --prefix="$out"
./Setup configure --verbose --prefix="$out" $configureFlags
eval "$postConfigure"
'';
@@ -70,10 +70,7 @@ attrs :
# installs via Cabal; creates a registration file for nix-support
# so that the package can be used in other Haskell-builds; also
# creates a register-${name}.sh in userspace that can be used to
# register the library in a user environment (but this scheme
# should sooner or later be deprecated in favour of using a
# ghc-wrapper).
# adds all propagated build inputs to the user environment packages
installPhase = ''
eval "$preInstall"
@@ -82,6 +79,9 @@ attrs :
local confDir=$out/lib/ghc-pkgs/ghc-${attrs.ghc.ghc.version}
ensureDir $confDir
./Setup register --gen-pkg-config=$confDir/${self.fname}.conf
ensureDir $out/nix-support
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
eval "$postInstall"
'';

9
pkgs/development/libraries/haskell/haskell-platform/default.nix
View File

@@ -1,6 +1,6 @@
{cabal, fetchurl, GLUT, HTTP, HUnit, OpenAL, OpenGL, QuickCheck, cgi, fgl,
haskellSrc, html, parallel, regexBase, regexCompat, regexPosix,
stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock}:
stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}:
cabal.mkDerivation (self : {
pname = "haskell-platform";
@@ -20,13 +20,8 @@ cabal.mkDerivation (self : {
propagatedBuildInputs = [
GLUT HTTP HUnit OpenAL OpenGL QuickCheck cgi fgl
haskellSrc html parallel regexBase regexCompat regexPosix
stm time xhtml zlib cabalInstall alex happy
stm time xhtml zlib cabalInstall alex happy ghc
];
/*
postFixup = ''
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
'';
*/
meta = {
description = "Haskell Platform meta package";
};