diff options
| author | Peter Simons <simons@cryp.to> | 2015-05-05 16:00:45 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-05-05 16:00:45 +0200 |
| commit | 63286c7d799e1883a36a588524f0134ef6aa99b8 (patch) | |
| tree | 1328e9f4e5966b2c14107095c527d474b09e2a24 /pkgs | |
| parent | e580d75aaa3d2d305f5ee8c34191c8e8b81e3e9d (diff) | |
| parent | cc8539293c37e9b1481ba37abc4157c3fd4f9be2 (diff) | |
| download | nixlib-63286c7d799e1883a36a588524f0134ef6aa99b8.tar nixlib-63286c7d799e1883a36a588524f0134ef6aa99b8.tar.gz nixlib-63286c7d799e1883a36a588524f0134ef6aa99b8.tar.bz2 nixlib-63286c7d799e1883a36a588524f0134ef6aa99b8.tar.lz nixlib-63286c7d799e1883a36a588524f0134ef6aa99b8.tar.xz nixlib-63286c7d799e1883a36a588524f0134ef6aa99b8.tar.zst nixlib-63286c7d799e1883a36a588524f0134ef6aa99b8.zip | |
Merge pull request #7644 from phile314/master
haskell-uhc: New version with GHC 7.10 support.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/uhc/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 6096fc4e4c4a..c788112fb91c 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -2,13 +2,13 @@ let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] ); in stdenv.mkDerivation rec { - version = "1.1.8.10"; + version = "1.1.9.0"; name = "uhc-${version}"; src = fetchgit { url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "449d9578e06af1362d7f746798f0aed57ab6ca88"; - sha256 = "0f8abhl9idbc2qlnb7ynrb11yvm3y07vksyzs1yg6snjvlhfj5az"; + rev = "0363bbcf4cf8c47d30c3a188e3e53b3f8454bbe4"; + sha256 = "0sa9b341mm5ggmbydc33ja3h7k9w65qnki9gsaagb06gkvvqc7c2"; }; postUnpack = "sourceRoot=\${sourceRoot}/EHC"; @@ -22,8 +22,8 @@ in stdenv.mkDerivation rec { # want that, and hack the build process to use a temporary package # configuration file instead. preConfigure = '' - p=`pwd`/uhc-local-packages - echo '[]' > $p + p=`pwd`/uhc-local-packages/ + ghc-pkg init $p 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|/bin/date|${coreutils}/bin/date|g" mk/dist.mk |