diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-19 11:17:46 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-21 23:31:04 -0500 |
| commit | 8560c025bc995577c9f9399fe8f9e7c1db5cd75f (patch) | |
| tree | b727ba38b49e25760f2b8b5b7498816b69985b52 /pkgs | |
| parent | a2516efb2638896df2f02e42b9f0978845db2e9f (diff) | |
| download | nixlib-8560c025bc995577c9f9399fe8f9e7c1db5cd75f.tar nixlib-8560c025bc995577c9f9399fe8f9e7c1db5cd75f.tar.gz nixlib-8560c025bc995577c9f9399fe8f9e7c1db5cd75f.tar.bz2 nixlib-8560c025bc995577c9f9399fe8f9e7c1db5cd75f.tar.lz nixlib-8560c025bc995577c9f9399fe8f9e7c1db5cd75f.tar.xz nixlib-8560c025bc995577c9f9399fe8f9e7c1db5cd75f.tar.zst nixlib-8560c025bc995577c9f9399fe8f9e7c1db5cd75f.zip | |
ghc 8.4.1: Reformat to move rev into src
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.1.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index 6eafc90fa18a..2fb5a0d404a6 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -32,8 +32,6 @@ assert !enableIntegerSimple -> gmp != null; let inherit (bootPkgs) ghc; - rev = "3e3a096885c0fcd0703edbeffb4e47f5cbd8f4cc"; - # TODO(@Ericson2314) Make unconditional targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) @@ -69,12 +67,13 @@ let in stdenv.mkDerivation rec { - inherit version rev; + inherit version; + inherit (src) rev; name = "${targetPrefix}ghc-${version}"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; - inherit rev; + rev = "3e3a096885c0fcd0703edbeffb4e47f5cbd8f4cc"; sha256 = "06slymbsd7vsfp4hh40v7cxf7nmp0kvlni2wfq7ag5wlqh04slgs"; }; @@ -104,7 +103,7 @@ stdenv.mkDerivation rec { echo -n "${buildMK}" > mk/build.mk echo ${version} >VERSION - echo ${rev} >GIT_COMMIT_ID + echo ${src.rev} >GIT_COMMIT_ID ./boot sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' |