Skip to content

haskell{,Packages}: use recurseIntoAttrs #437195

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
wolfgangwalther merged 1 commit into from
Sep 2, 2025
Merged

haskell{,Packages}: use recurseIntoAttrs #437195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5155,10 +5155,10 @@ with pkgs;

# Haskell and GHC

haskell = callPackage ./haskell-packages.nix { };
haskell = recurseIntoAttrs (callPackage ./haskell-packages.nix { });

haskellPackages =
dontRecurseIntoAttrs
recurseIntoAttrs
# Prefer native-bignum to avoid linking issues with gmp
# GHC 9.6 rts can't be built statically with hadrian, so we need to use 9.4
# until 9.8 is ready
Expand Down
5 changes: 3 additions & 2 deletions pkgs/top-level/haskell-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ in
# `name: pkgs: pkgs.haskell.packages.${name}.ghc == pkgs.buildPackages.haskell.compiler.${name}.ghc`.
# This isn't problematic since pkgsBuildBuild.buildPackages is also build->build,
# just something to keep in mind.
compiler =
compiler = pkgs.lib.recurseIntoAttrs (
let
bb = pkgsBuildBuild.haskell;
in
Expand Down Expand Up @@ -496,7 +496,8 @@ in
name: compiler.${name}.override { enableNativeBignum = true; }
)
);
};
}
);

# Default overrides that are applied to all package sets.
packageOverrides = self: super: { };
Expand Down
8 changes: 0 additions & 8 deletions pkgs/top-level/packages-config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,11 @@
inherit (super)
fusePackages
gns3Packages
haskellPackages
platformioPackages
rPackages
sourceHanPackages
;

# Make sure haskell.compiler is included, so alternative GHC versions show up,
# but don't add haskell.packages.* since they contain the same packages (at
# least by name) as haskellPackages.
haskell = super.haskell // {
compiler = recurseIntoAttrs super.haskell.compiler;
};

# emacsPackages is an alias for emacs.pkgs
# Re-introduce emacsPackages here so that emacs.pkgs can be searched.
emacsPackages = emacs.pkgs;
Expand Down
38 changes: 19 additions & 19 deletions pkgs/top-level/release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,27 +359,27 @@ let
if attrNamesOnly then id else release-lib.getPlatforms
);
packageJobs = packagePlatforms pkgs // {
haskell.compiler = packagePlatforms pkgs.haskell.compiler;
haskellPackages = packagePlatforms pkgs.haskellPackages;
# Build selected packages (HLS) for multiple Haskell compilers to rebuild
# the cache after a staging merge
haskell.packages =
genAttrs
[
# TODO: share this list between release.nix and release-haskell.nix
"ghc90"
"ghc92"
"ghc94"
"ghc96"
"ghc98"
"ghc910"
"ghc912"
]
(compilerName: {
inherit (packagePlatforms pkgs.haskell.packages.${compilerName})
haskell-language-server
;
});
haskell = packagePlatforms pkgs.haskell // {
packages =
genAttrs
[
# TODO: share this list between release.nix and release-haskell.nix
"ghc90"
"ghc92"
"ghc94"
"ghc96"
"ghc98"
"ghc910"
"ghc912"
]
(compilerName: {
inherit (packagePlatforms pkgs.haskell.packages.${compilerName})
haskell-language-server
;
});
};

pkgsLLVM.stdenv = [
"x86_64-linux"
Expand Down
Loading