diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-11-23 16:11:37 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2021-11-23 16:46:18 +0100 |
| commit | d7ff8061beed6ce1c141066fd268cdbb5acc0dd1 (patch) | |
| tree | fc7d0a33a1a7b7d819bba2694517a0045d1b7883 /pkgs/development/compilers | |
| parent | e191321866b1d754eed23a577837f183c76581f7 (diff) | |
| download | nixpkgs-d7ff8061beed6ce1c141066fd268cdbb5acc0dd1.tar nixpkgs-d7ff8061beed6ce1c141066fd268cdbb5acc0dd1.tar.gz nixpkgs-d7ff8061beed6ce1c141066fd268cdbb5acc0dd1.tar.bz2 nixpkgs-d7ff8061beed6ce1c141066fd268cdbb5acc0dd1.tar.lz nixpkgs-d7ff8061beed6ce1c141066fd268cdbb5acc0dd1.tar.xz nixpkgs-d7ff8061beed6ce1c141066fd268cdbb5acc0dd1.tar.zst nixpkgs-d7ff8061beed6ce1c141066fd268cdbb5acc0dd1.zip | |
haskellPackages: always inherit llvmPackages from ghc's passthru
This means we only have to update the llvmPackages attribute in one place now and should prevent situations like with 8.6.5 where different versions would be used in the package set compared to the compiler build. Drop comments in the configuration-ghc-X.Y.x.nix files as well, since LLVM version isn't tied to the compiler minor version at all (e. g. 8.10.2 and 8.10.7 have different support ranges).
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.10.2-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.10.7-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5-binary.nix | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index bf909016ac2..93ebca2b6c4 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -378,6 +378,8 @@ stdenv.mkDerivation rec { targetPrefix = ""; enableShared = true; + inherit llvmPackages; + # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; }; diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 58be16dc569..a8ec751d2d2 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -378,6 +378,8 @@ stdenv.mkDerivation rec { targetPrefix = ""; enableShared = true; + inherit llvmPackages; + # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; }; diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index b1126fda7d2..5b52f0e4cdd 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -181,6 +181,8 @@ stdenv.mkDerivation rec { targetPrefix = ""; enableShared = true; + inherit llvmPackages; + # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; }; |