From a9400e64e717d96aa1a668095eadf38605e451a8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 14 Jun 2018 11:35:19 -0400 Subject: [PATCH] ghcjs: add version to haskellCompilerName This is needed for some cabal2nix stuff in getting the version. Previously we had left out the version but apparently this can cause problems in some scenarios. /cc @elvishjerricco @peti @ericson2314 --- pkgs/development/compilers/ghcjs-ng/default.nix | 2 +- pkgs/development/compilers/ghcjs/base.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index dda414620e0..93257ff7d53 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -48,7 +48,7 @@ let stage1Packages = []; mkStage2 = _: {}; - haskellCompilerName = "ghcjs"; + haskellCompilerName = "ghcjs-${bootGhcjs.version}"; }; bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs; diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 07662d32d25..98eb58e6aae 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -174,7 +174,7 @@ in mkDerivation (rec { isGhcjs = true; inherit nodejs ghcjsBoot; socket-io = pkgs.nodePackages."socket.io"; - haskellCompilerName = "ghcjs"; + haskellCompilerName = "ghcjs-${version}"; # let us assume ghcjs is never actually cross compiled targetPrefix = "";