diff options
| author | Peter Simons <simons@cryp.to> | 2018-07-16 10:55:17 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-07-16 10:56:36 +0200 |
| commit | c661f96968d5ba8c2ef6af99bd4099fd968fc7f9 (patch) | |
| tree | 6f38579e35e109c0943e0c3c19a5717af1ac782a /pkgs/development/haskell-modules | |
| parent | f3341e233051293dcc944020c43d83f84508a4a3 (diff) | |
| download | nixpkgs-c661f96968d5ba8c2ef6af99bd4099fd968fc7f9.tar nixpkgs-c661f96968d5ba8c2ef6af99bd4099fd968fc7f9.tar.gz nixpkgs-c661f96968d5ba8c2ef6af99bd4099fd968fc7f9.tar.bz2 nixpkgs-c661f96968d5ba8c2ef6af99bd4099fd968fc7f9.tar.lz nixpkgs-c661f96968d5ba8c2ef6af99bd4099fd968fc7f9.tar.xz nixpkgs-c661f96968d5ba8c2ef6af99bd4099fd968fc7f9.tar.zst nixpkgs-c661f96968d5ba8c2ef6af99bd4099fd968fc7f9.zip | |
Consistently pass versioned llvmPackages_x attributes to GHC.
Otherwise, these configurations are going to break when Nixpkgs updates to llvm 6.x.
Diffstat (limited to 'pkgs/development/haskell-modules')
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 7b83d260d90..39c5a177b92 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # Use the latest LLVM. - inherit (pkgs) llvmPackages; + # This compiler version needs llvm 5.x. + llvmPackages = pkgs.llvmPackages_5; # Disable GHC 8.4.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index bc540cbe36d..b2e9d43ef08 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # Use the latest LLVM. - inherit (pkgs) llvmPackages; + # This compiler version needs llvm 5.x. + llvmPackages = pkgs.llvmPackages_5; # Disable GHC 8.6.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 93a39beb8a9..99f4cd87ce5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -4,8 +4,8 @@ with haskellLib; self: super: { - # Use the latest LLVM. - inherit (pkgs) llvmPackages; + # This compiler version needs llvm 5.x. + llvmPackages = pkgs.llvmPackages_5; # Disable GHC 8.7.x core libraries. array = null; |