[25.05] top-level: various improvements to release.nix & co#439705
[25.05] top-level: various improvements to release.nix & co#439705wolfgangwalther merged 6 commits intoNixOS:release-25.05from
Conversation
these package set where already recoursed into (cherry picked from commit 52e3845)
(cherry picked from commit 24fe5f5)
(cherry picked from commit 3b7e163)
makes it so nixpkgs-review is running tests (cherry picked from commit ee6ba1c)
(cherry picked from commit a282257)
(cherry picked from commit 99c0500)
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between 128d420 and original a282257 may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
release.nix: don't use special treatment for more package sets
+ (cherry picked from commit a282257e0a51912b53837bef4b36156dc13cc12a)
+
## pkgs/os-specific/darwin/xcode/default.nix ##
@@ pkgs/os-specific/darwin/xcode/default.nix: let
description = "Apple's XCode SDK";
@@ pkgs/top-level/darwin-packages.nix: makeScopeWithSplicing' {
- };
-
- binutils = pkgs.wrapBintoolsWith {
-- inherit (targetPackages) libc;
+- libc = if stdenv.targetPlatform != stdenv.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc;
- bintools = self.binutils-unwrapped;
- };
-
@@ pkgs/top-level/darwin-packages.nix: makeScopeWithSplicing' {
- };
-
- binutilsNoLibc = pkgs.wrapBintoolsWith {
-- libc = targetPackages.preLibcHeaders;
+- libc = preLibcCrossHeaders;
- bintools = self.binutils-unwrapped;
- };
-
@@ pkgs/top-level/darwin-packages.nix: makeScopeWithSplicing' {
- xcode_16_1
- xcode_16_2
- xcode_16_3
-- xcode_16_4
- xcode
- requireXcode
- ;
@@ pkgs/top-level/darwin-packages.nix: makeScopeWithSplicing' {
+ };
+
+ binutils = pkgs.wrapBintoolsWith {
-+ inherit (targetPackages) libc;
++ libc = if stdenv.targetPlatform != stdenv.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc;
+ bintools = self.binutils-unwrapped;
+ };
+
@@ pkgs/top-level/darwin-packages.nix: makeScopeWithSplicing' {
+ };
+
+ binutilsNoLibc = pkgs.wrapBintoolsWith {
-+ libc = targetPackages.preLibcHeaders;
++ libc = preLibcCrossHeaders;
+ bintools = self.binutils-unwrapped;
+ };
+
@@ pkgs/top-level/darwin-packages.nix: makeScopeWithSplicing' {
+ xcode_16_1
+ xcode_16_2
+ xcode_16_3
-+ xcode_16_4
+ xcode
+ requireXcode
+ ;
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
Resolved some conflicts in darwin-packages.nix, where the big indented block had some changes.
This backports:
The changes worked well, this should not cause any problems.
I'm backporting this, because
release-outpaths.nix/release-attrpaths.nixetc. belong to CI (Eval), thus are always backported. They are relatively tightly coupled torelease.nix, thus the latter needs some backports as well. To make backporting easier to reason about and result in fewer conflicts, I'll just bring these commits along.