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/haskell-modules/configuration-ghc-9.0.x.nix | |
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/haskell-modules/configuration-ghc-9.0.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 08d1ba3b210..7999e228c74 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -4,8 +4,7 @@ with haskellLib; self: super: { - # This compiler version needs llvm 10.x. - llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; # Disable GHC 9.0.x core libraries. array = null; |