From 921f5db2989cb95dc5b24bb75fb74f7b7f54e535 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 8 Sep 2025 02:39:38 +0100 Subject: [PATCH] haskellPackages.llvmPackages: drop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There’s no sensible notion of a Haskell package set’s LLVM, only a GHC’s LLVM. `haskellPackages.ghc.llvmPackages` is still accessible, although you probably don’t actually want to use it very often. Co-authored-by: sternenseemann --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 -- pkgs/development/haskell-modules/make-package-set.nix | 2 +- pkgs/development/haskell-modules/with-packages-wrapper.nix | 4 ++-- 10 files changed, 3 insertions(+), 19 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 549523c2ff66..3cd9002c3a02 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -13,8 +13,6 @@ in self: super: { - llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC 9.0.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 40351fcd3635..fbac3690a708 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -16,8 +16,6 @@ let in { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index 63162d068237..79afa7b31ccb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -16,8 +16,6 @@ in with haskellLib; { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix index 2e743b996f6c..555870017bcf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix @@ -6,8 +6,6 @@ let in self: super: { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index cd67a884e853..10e5d2bd55d9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -13,8 +13,6 @@ in self: super: { - llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC 9.2.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 4a1afd49fcb1..924f7c1309f8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -6,8 +6,6 @@ in with haskellLib; self: super: { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 60214323e839..bfc688281f22 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -16,8 +16,6 @@ let in { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index f56b3108ba51..e70da8a3e688 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -18,8 +18,6 @@ in { - llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 44dc23278963..d53c092ed022 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -734,6 +734,6 @@ package-set { inherit pkgs lib callPackage; } self */ forceLlvmCodegenBackend = overrideCabal (drv: { configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ]; - buildTools = drv.buildTools or [ ] ++ [ self.llvmPackages.llvm ]; + buildTools = drv.buildTools or [ ] ++ [ self.ghc.llvmPackages.llvm ]; }); } diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index b683febeaf6c..0df9ec093ef7 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -44,7 +44,7 @@ selectPackages: # fi let - inherit (haskellPackages) llvmPackages ghc; + inherit (haskellPackages) ghc; hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null; @@ -71,7 +71,7 @@ let # CLang is needed on Darwin for -fllvm to work: # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm llvm = lib.makeBinPath ( - [ llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang + [ ghc.llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin ghc.llvmPackages.clang ); in