From 5a0f0bc0ca4002619ff4ef8c7d71f418d148f01b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 12 Aug 2015 08:47:06 +0200 Subject: ghc: make sure the nokinds version is built with a deterministic version number --- pkgs/development/compilers/ghc/nokinds.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/compilers/ghc') diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix index 98e18706a16c..2bd3fb55b70f 100644 --- a/pkgs/development/compilers/ghc/nokinds.nix +++ b/pkgs/development/compilers/ghc/nokinds.nix @@ -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 -- cgit 1.4.1 From f741d426da265c6a4e38a070b5deb7793fe22ce8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Aug 2015 11:17:01 +0200 Subject: ghc-nokinds: remove "nokinds" tag from derivation name The name of the GHC derivation must match the name and version tuple GHC uses to identify itself, because the withPackages wrapper uses that name to construct installation library paths etc., and those paths must match those constructed by the compiler. If we add another tag to the name that GHC itself doesn't use, then the paths assumed to exist by the wrapper are wrong. --- pkgs/development/compilers/ghc/nokinds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/compilers/ghc') diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix index 2bd3fb55b70f..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 { -- cgit 1.4.1