From a9646b39cfcf8ecb860587c4adbc986ca627d2ce Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 22 Feb 2018 03:11:25 -0500 Subject: [PATCH] Fix haskellCompilerName version. This matters for `callCabal2nix`, when the cabal file has something like `if impl(ghc >= 7.7)` --- pkgs/development/compilers/ghc/7.0.4-binary.nix | 2 +- pkgs/development/compilers/ghc/7.0.4.nix | 2 +- pkgs/development/compilers/ghc/7.10.3.nix | 2 +- pkgs/development/compilers/ghc/7.4.2-binary.nix | 2 +- pkgs/development/compilers/ghc/7.4.2.nix | 2 +- pkgs/development/compilers/ghc/7.6.3.nix | 2 +- pkgs/development/compilers/ghc/7.8.4.nix | 2 +- pkgs/development/compilers/ghc/8.0.2.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 2 +- pkgs/development/compilers/ghc/8.4.1.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 51dd24671bdd..8758ee59d384 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.0.4"; }; meta.license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 54323458d9bd..5bd05b257ca5 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.0.4"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index c4780690f678..e4bf23c6e9e2 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.10.3"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 4f00ef8fb751..988392e74b9e 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.4.2"; }; meta.license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 7f636284c68d..86925c406cfc 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.4.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index 481b8d90918c..982008563a06 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.6.3"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 15f105946f51..47fc090c1ff1 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.8.4"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 011822994ed3..7d11ffb66c60 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.0.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index f4aa2de3241e..1c3f260da1c1 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.2.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index e7ec9be16b69..366ebaf9bc01 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -190,7 +190,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.4.1"; }; meta = { diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 82cef10ce3be..bc3ccbdcdf51 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.5"; }; meta = {