diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-13 11:55:02 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-13 11:55:02 -0700 |
| commit | 952def0e3c9fdb8edbfcaa187609911f350c8e02 (patch) | |
| tree | 60226de48423053363db722f85ac42ff8e5f8992 /pkgs/development/compilers/ghc | |
| parent | 257db17ee950d2865529603d1388cf7fbb8a0a89 (diff) | |
| parent | bc9bd5c02c38d6c5ae5b2e62fd0fe21c767413c7 (diff) | |
| download | nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.gz nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.bz2 nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.lz nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.xz nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.tar.zst nixlib-952def0e3c9fdb8edbfcaa187609911f350c8e02.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/nokinds.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix index 98e18706a16c..ab270c161263 100644 --- a/pkgs/development/compilers/ghc/nokinds.nix +++ b/pkgs/development/compilers/ghc/nokinds.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { version = "7.11.20150718"; - name = "ghc-nokinds-${version}"; + name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details. rev = "4cb79c85a4976c509a65a8638899391a60cd0962"; src = fetchgit { @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { postUnpack = '' pushd ghc-${builtins.substring 0 7 rev} + echo ${version} >VERSION + echo ${rev} >GIT_COMMIT_ID patchShebangs . ./boot popd |