gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.llvmPackages: drop

Browse Source 
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 <sternenseemann@systemli.org>
This commit is contained in:
Emily
2025-09-11 15:13:56 +02:00
committed by sternenseemann
co-authored by sternenseemann
parent fab98a0dca
commit 921f5db298
10 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
-2
View File
@@ -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;
pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
-2
View File
@@ -16,8 +16,6 @@ let
in
{
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
# Disable GHC core libraries
array = null;
base = null;
pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
-2
View File
@@ -16,8 +16,6 @@ in
with haskellLib;
{
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
# Disable GHC core libraries
array = null;
base = null;
pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
-2
View File
@@ -6,8 +6,6 @@ let
in
self: super: {
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
# Disable GHC core libraries
array = null;
base = null;
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
-2
View File
@@ -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;
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
-2
View File
@@ -6,8 +6,6 @@ in
with haskellLib;
self: super: {
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
# Disable GHC core libraries.
array = null;
base = null;
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
-2
View File
@@ -16,8 +16,6 @@ let
in
{
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
# Disable GHC core libraries
array = null;
base = null;
pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
-2
View File
@@ -18,8 +18,6 @@ in
{
llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
# Disable GHC core libraries.
array = null;
base = null;
pkgs/development/haskell-modules/make-package-set.nix
+1 -1
View File
@@ -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 ];
});
}
pkgs/development/haskell-modules/with-packages-wrapper.nix
+2 -2
View File
@@ -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