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

Merge pull request #42023 from obsidiansystems/ghcjs-compiler-name 

ghcjs: add version to haskellCompilerName
This commit is contained in:
Matthew Justin Bauer 2018-06-14 12:35:22 -04:00 committed by GitHub
parent 6a916d029e a9400e64e7
commit 4c7aae7026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ghcjs-ng/default.nix
View File

@ -48,7 +48,7 @@ let
stage1Packages = []; stage1Packages = [];
mkStage2 = _: {}; mkStage2 = _: {};
haskellCompilerName = "ghcjs"; haskellCompilerName = "ghcjs-${bootGhcjs.version}";
}; };
bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs; bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;

2
pkgs/development/compilers/ghcjs/base.nix
View File

@ -174,7 +174,7 @@ in mkDerivation (rec {
isGhcjs = true; isGhcjs = true;
inherit nodejs ghcjsBoot; inherit nodejs ghcjsBoot;
socket-io = pkgs.nodePackages."socket.io"; socket-io = pkgs.nodePackages."socket.io";
haskellCompilerName = "ghcjs"; haskellCompilerName = "ghcjs-${version}";
# let us assume ghcjs is never actually cross compiled # let us assume ghcjs is never actually cross compiled
targetPrefix = ""; targetPrefix = "";