-
-
Notifications
You must be signed in to change notification settings - Fork 18.2k
[Backport release-25.05] pkgs/top-level/stage.nix: move most nixpkgs sets to variants #410362
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.
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
RossComputerGuy
merged 1 commit into
release-25.05
from
backport-400351-to-release-25.05
May 24, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| This file contains all of the different variants of nixpkgs instances. | ||
|
|
||
| Unlike the other package sets like pkgsCross, pkgsi686Linux, etc., this | ||
| contains non-critical package sets. The intent is to be a shorthand | ||
| for things like using different toolchains in every package in nixpkgs. | ||
| */ | ||
| { | ||
| lib, | ||
| stdenv, | ||
| nixpkgsFun, | ||
| overlays, | ||
| makeMuslParsedPlatform, | ||
| }: | ||
| let | ||
| makeLLVMParsedPlatform = | ||
| parsed: | ||
| ( | ||
| parsed | ||
| // { | ||
| abi = lib.systems.parse.abis.llvm; | ||
| } | ||
| ); | ||
| in | ||
| self: super: { | ||
| pkgsLLVM = nixpkgsFun { | ||
| overlays = [ | ||
| (self': super': { | ||
| pkgsLLVM = super'; | ||
| }) | ||
| ] ++ overlays; | ||
| # Bootstrap a cross stdenv using the LLVM toolchain. | ||
| # This is currently not possible when compiling natively, | ||
| # so we don't need to check hostPlatform != buildPlatform. | ||
| crossSystem = stdenv.hostPlatform // { | ||
| useLLVM = true; | ||
| linker = "lld"; | ||
| }; | ||
| }; | ||
|
|
||
| pkgsArocc = nixpkgsFun { | ||
| overlays = [ | ||
| (self': super': { | ||
| pkgsArocc = super'; | ||
| }) | ||
| ] ++ overlays; | ||
| # Bootstrap a cross stdenv using the Aro C compiler. | ||
| # This is currently not possible when compiling natively, | ||
| # so we don't need to check hostPlatform != buildPlatform. | ||
| crossSystem = stdenv.hostPlatform // { | ||
| useArocc = true; | ||
| linker = "lld"; | ||
| }; | ||
| }; | ||
|
|
||
| pkgsZig = nixpkgsFun { | ||
| overlays = [ | ||
| (self': super': { | ||
| pkgsZig = super'; | ||
| }) | ||
| ] ++ overlays; | ||
| # Bootstrap a cross stdenv using the Zig toolchain. | ||
| # This is currently not possible when compiling natively, | ||
| # so we don't need to check hostPlatform != buildPlatform. | ||
| crossSystem = stdenv.hostPlatform // { | ||
| useZig = true; | ||
| linker = "lld"; | ||
| }; | ||
| }; | ||
|
|
||
| # All packages built with the Musl libc. This will override the | ||
| # default GNU libc on Linux systems. Non-Linux systems are not | ||
| # supported. 32-bit is also not supported. | ||
| pkgsMusl = | ||
| if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then | ||
| nixpkgsFun { | ||
| overlays = [ | ||
| (self': super': { | ||
| pkgsMusl = super'; | ||
| }) | ||
| ] ++ overlays; | ||
| ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { | ||
| config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); | ||
| }; | ||
| } | ||
| else | ||
| throw "Musl libc only supports 64-bit Linux systems."; | ||
|
|
||
| # Full package set with rocm on cuda off | ||
| # Mostly useful for asserting pkgs.pkgsRocm.torchWithRocm == pkgs.torchWithRocm and similar | ||
| pkgsRocm = nixpkgsFun ({ | ||
| config = super.config // { | ||
| cudaSupport = false; | ||
| rocmSupport = true; | ||
| }; | ||
| }); | ||
|
|
||
| pkgsExtraHardening = nixpkgsFun { | ||
| overlays = [ | ||
| ( | ||
| self': super': | ||
| { | ||
| pkgsExtraHardening = super'; | ||
| stdenv = super'.withDefaultHardeningFlags ( | ||
| super'.stdenv.cc.defaultHardeningFlags | ||
| ++ [ | ||
| "shadowstack" | ||
| "nostrictaliasing" | ||
| "pacret" | ||
| "trivialautovarinit" | ||
| ] | ||
| ) super'.stdenv; | ||
| glibc = super'.glibc.override rec { | ||
| enableCET = if self'.stdenv.hostPlatform.isx86_64 then "permissive" else false; | ||
| enableCETRuntimeDefault = enableCET != false; | ||
| }; | ||
| } | ||
| // lib.optionalAttrs (with super'.stdenv.hostPlatform; isx86_64 && isLinux) { | ||
| # causes shadowstack disablement | ||
| pcre = super'.pcre.override { enableJit = false; }; | ||
| pcre-cpp = super'.pcre-cpp.override { enableJit = false; }; | ||
| pcre16 = super'.pcre16.override { enableJit = false; }; | ||
| } | ||
| ) | ||
| ] ++ overlays; | ||
| }; | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should target rl-2505, as-per #410359, right?