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

ghc 8.4.1: Reformat to move rev into src

Browse Source
This commit is contained in:
John Ericson 2018-01-19 11:17:46 -05:00
parent a2516efb26
commit 8560c025bc
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/ghc/8.4.1.nix
View File

@ -32,8 +32,6 @@ assert !enableIntegerSimple -> gmp != null;
let let
inherit (bootPkgs) ghc; inherit (bootPkgs) ghc;
rev = "3e3a096885c0fcd0703edbeffb4e47f5cbd8f4cc";
# TODO(@Ericson2314) Make unconditional # TODO(@Ericson2314) Make unconditional
targetPrefix = stdenv.lib.optionalString targetPrefix = stdenv.lib.optionalString
(targetPlatform != hostPlatform) (targetPlatform != hostPlatform)
@ -69,12 +67,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit version rev; inherit version;
inherit (src) rev;
name = "${targetPrefix}ghc-${version}"; name = "${targetPrefix}ghc-${version}";
src = fetchgit { src = fetchgit {
url = "git://git.haskell.org/ghc.git"; url = "git://git.haskell.org/ghc.git";
inherit rev; rev = "3e3a096885c0fcd0703edbeffb4e47f5cbd8f4cc";
sha256 = "06slymbsd7vsfp4hh40v7cxf7nmp0kvlni2wfq7ag5wlqh04slgs"; sha256 = "06slymbsd7vsfp4hh40v7cxf7nmp0kvlni2wfq7ag5wlqh04slgs";
}; };
@ -104,7 +103,7 @@ stdenv.mkDerivation rec {
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK}" > mk/build.mk
echo ${version} >VERSION echo ${version} >VERSION
echo ${rev} >GIT_COMMIT_ID echo ${src.rev} >GIT_COMMIT_ID
./boot ./boot
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) ''