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

ghc-8.2.1: Get rid of preReleaseName binding now that it is released

Browse Source 
No hashes should be changed
This commit is contained in:
John Ericson 2017-09-10 17:23:05 -04:00
parent 33c99ab2fb
commit e916917acf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/ghc/8.2.1.nix
View File

@ -10,12 +10,12 @@
let let
inherit (bootPkgs) ghc; inherit (bootPkgs) ghc;
version = "8.2.1"; version = "8.2.1";
preReleaseName = "ghc-8.2.1";
commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
commonPreConfigure = '' commonPreConfigure = ''
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) '' '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/${preReleaseName}" export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof" export NIX_LDFLAGS+=" -no_dtrace_dof"
'' + stdenv.lib.optionalString enableIntegerSimple '' '' + stdenv.lib.optionalString enableIntegerSimple ''
@ -26,7 +26,7 @@ in stdenv.mkDerivation (rec {
name = "ghc-${version}"; name = "ghc-${version}";
src = fetchurl { src = fetchurl {
url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz"; url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz";
sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng"; sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng";
}; };
@ -57,7 +57,7 @@ in stdenv.mkDerivation (rec {
checkTarget = "test"; checkTarget = "test";
postInstall = '' postInstall = ''
paxmark m $out/lib/${preReleaseName}/bin/{ghc,haddock} paxmark m $out/lib/${name}/bin/{ghc,haddock}
# Install the bash completion file. # Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc