Skip to content

haskellPackages.*: don’t depend on GHC’s LLVM version #441101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sternenseemann merged 4 commits into from
Sep 11, 2025
Merged

haskellPackages.*: don’t depend on GHC’s LLVM version #441101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d1b1aa
haskellPackages.spaceprobe: don’t force the LLVM backend
emilazy Sep 8, 2025
6409663
haskellPackages.GlomeVec: don’t force the LLVM backend
emilazy Sep 8, 2025
fab98a0
haskellPackages.cabal2nix-unstable: 2025-09-06 -> 2025-09-09
emilazy Sep 8, 2025
921f5db
haskellPackages.llvmPackages: drop
emilazy Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/cabal2nix-unstable.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2025-09-06";
version = "unstable-2025-09-09";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/fe1b21c9fb01f3f8a9028744499f20b7799cad38.tar.gz";
sha256 = "0g9pa8914mdnbbhy3far689xckfblavwv0ylmzi0h4p7v8alrjx7";
url = "https://github.com/NixOS/cabal2nix/archive/987474e0b0ed1c6b0e3fd0d07313f6996ec98b7e.tar.gz";
sha256 = "0nixn8incqypsfyfclj40p8bdx2yn4783kzwpqfp19ql2sbc57dc";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ let
in

{
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

# Disable GHC core libraries
array = null;
base = null;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ in
with haskellLib;

{
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

# Disable GHC core libraries
array = null;
base = null;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ let
in

self: super: {
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

# Disable GHC core libraries
array = null;
base = null;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ in

with haskellLib;
self: super: {
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

# Disable GHC core libraries.
array = null;
base = null;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ let
in

{
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

# Disable GHC core libraries
array = null;
base = null;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ in

{

llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

# Disable GHC core libraries.
array = null;
base = null;
Expand Down
18 changes: 16 additions & 2 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,22 @@ builtins.intersectAttrs super {
)
);

# Needs help finding LLVM.
spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe;
# Forces the LLVM backend; upstream signalled intent to remove this
# in 2017: <https://github.com/SeanRBurton/spaceprobe/issues/1>.
spaceprobe = overrideCabal (drv: {
postPatch = ''
substituteInPlace spaceprobe.cabal \
--replace-fail '-fllvm ' ""
'';
}) super.spaceprobe;

# Forces the LLVM backend.
GlomeVec = overrideCabal (drv: {
postPatch = ''
substituteInPlace GlomeVec.cabal \
--replace-fail '-fllvm ' ""
'';
}) super.GlomeVec;

# Tries to run GUI in tests
leksah = dontCheck (
Expand Down
28 changes: 13 additions & 15 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/make-package-set.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
});
}
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/with-packages-wrapper.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ selectPackages:
# fi

let
inherit (haskellPackages) llvmPackages ghc;
inherit (haskellPackages) ghc;

hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null;

Expand All @@ -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

Expand Down
Loading