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

Merge pull request #7644 from phile314/master

Browse Source 
haskell-uhc: New version with GHC 7.10 support.
This commit is contained in:
Peter Simons 2015-05-05 16:00:45 +02:00
commit 63286c7d79
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/uhc/default.nix
View File

@ -2,13 +2,13 @@
let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] ); let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] );
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.1.8.10"; version = "1.1.9.0";
name = "uhc-${version}"; name = "uhc-${version}";
src = fetchgit { src = fetchgit {
url = "https://github.com/UU-ComputerScience/uhc.git"; url = "https://github.com/UU-ComputerScience/uhc.git";
rev = "449d9578e06af1362d7f746798f0aed57ab6ca88"; rev = "0363bbcf4cf8c47d30c3a188e3e53b3f8454bbe4";
sha256 = "0f8abhl9idbc2qlnb7ynrb11yvm3y07vksyzs1yg6snjvlhfj5az"; sha256 = "0sa9b341mm5ggmbydc33ja3h7k9w65qnki9gsaagb06gkvvqc7c2";
}; };
postUnpack = "sourceRoot=\${sourceRoot}/EHC"; postUnpack = "sourceRoot=\${sourceRoot}/EHC";
@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
# want that, and hack the build process to use a temporary package # want that, and hack the build process to use a temporary package
# configuration file instead. # configuration file instead.
preConfigure = '' preConfigure = ''
p=`pwd`/uhc-local-packages p=`pwd`/uhc-local-packages/
echo '[]' > $p ghc-pkg init $p
sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in
sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in
sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk