From d892f1aa90c3a22016d78e3bedefa773dc66879a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 28 Sep 2018 12:06:31 -0400 Subject: [PATCH] ghcjs-*: Expose the version of GHC used This is more meaningful than the GHCJS version for most tasks. --- pkgs/development/compilers/ghcjs-ng/default.nix | 1 + pkgs/development/compilers/ghcjs/base.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 92211042acd..025d74bcda0 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -42,6 +42,7 @@ let targetPrefix = ""; inherit bootGhcjs; inherit (bootGhcjs) version; + ghcVersion = bootPkgs.ghc.version; isGhcjs = true; enableShared = true; diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 34c332d87d9..93e6a47934f 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -133,6 +133,7 @@ in mkDerivation (rec { ''; passthru = { inherit bootPkgs; + ghcVersion = ghc.version; isCross = true; isGhcjs = true; inherit nodejs ghcjsBoot;