diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-04 11:36:24 +0200 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-04 11:36:24 +0200 |
commit | 083ac8e64cfc33be74909e572622117927c45d73 (patch) | |
tree | 7a652b8993012465f237d1dd0f8f8db522059230 | |
parent | 6e9760124b11e5ea7ddd1607d873319910fa4baa (diff) | |
download | nixpkgs-083ac8e64cfc33be74909e572622117927c45d73.tar nixpkgs-083ac8e64cfc33be74909e572622117927c45d73.tar.gz nixpkgs-083ac8e64cfc33be74909e572622117927c45d73.tar.bz2 nixpkgs-083ac8e64cfc33be74909e572622117927c45d73.tar.lz nixpkgs-083ac8e64cfc33be74909e572622117927c45d73.tar.xz nixpkgs-083ac8e64cfc33be74909e572622117927c45d73.tar.zst nixpkgs-083ac8e64cfc33be74909e572622117927c45d73.zip |
haskellPackages.llvmPackages: dontRecurseIntoAttrs
They are not an exposed part of haskellPackages per se, so we shouldn't list them in nix-env. Additionally this should prevent the failed lldb build from cluttering our jobset output.
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 9866364e34a..36fe13151f3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 9.x. - llvmPackages = pkgs.llvmPackages_9; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_9; # Disable GHC 8.10.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 bcce0bb897c..99b53b9f14f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 6.x. - llvmPackages = pkgs.llvmPackages_6; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_6; # Disable GHC 8.6.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 8fb10d8b05f..aab26897cca 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 7.x. - llvmPackages = pkgs.llvmPackages_7; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_7; # Disable GHC 8.8.x core libraries. array = null; 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 ff82fc8c199..16c85d1fef7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 10.x. - llvmPackages = pkgs.llvmPackages_10; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10; # Disable GHC 9.0.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 2b136c6bf83..ca455a7c892 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -11,7 +11,7 @@ with haskellLib; self: super: { - llvmPackages = pkgs.llvmPackages_10; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10; # Disable GHC 8.7.x core libraries. array = null; |