Skip to content

nixVersions.latest: 2.26 -> 2.28#396773

Merged
roberth merged 3 commits intoNixOS:masterfrom
Mic92:nix-version
Apr 7, 2025
Merged

nixVersions.latest: 2.26 -> 2.28#396773
roberth merged 3 commits intoNixOS:masterfrom
Mic92:nix-version

Conversation

@Mic92
Copy link
Member

@Mic92 Mic92 commented Apr 7, 2025 •
edited
Loading

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 7, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 7, 2025
@Mic92
Copy link
Member Author

Mic92 commented Apr 7, 2025 •
edited
Loading

Requested a patch release for nix 2.28 to get of the commit revision, will come probably before I can finish the nixpkgs-review.

@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 7, 2025
@Mic92
Copy link
Member Author

Mic92 commented Apr 7, 2025

https://github.com/NixOS/nix/releases/tag/2.28.1

@github-actions github-actions bot removed 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Apr 7, 2025
@Mic92

This comment was marked as resolved.

Sign in to view
@Mic92

This comment was marked as resolved.

Sign in to view
@Mic92
Copy link
Member Author

Mic92 commented Apr 7, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 396773

x86_64-linux

✅ 4 packages built:
  • nixVersions.latest (nixVersions.nix_2_28)
  • nixVersions.latest.dev (nixVersions.nix_2_28.dev)
  • nixVersions.latest.doc (nixVersions.nix_2_28.doc)
  • nixVersions.latest.man (nixVersions.nix_2_28.man)

aarch64-linux

✅ 4 packages built:
  • nixVersions.latest (nixVersions.nix_2_28)
  • nixVersions.latest.dev (nixVersions.nix_2_28.dev)
  • nixVersions.latest.doc (nixVersions.nix_2_28.doc)
  • nixVersions.latest.man (nixVersions.nix_2_28.man)

x86_64-darwin

✅ 4 packages built:
  • nixVersions.latest (nixVersions.nix_2_28)
  • nixVersions.latest.dev (nixVersions.nix_2_28.dev)
  • nixVersions.latest.doc (nixVersions.nix_2_28.doc)
  • nixVersions.latest.man (nixVersions.nix_2_28.man)

aarch64-darwin

✅ 4 packages built:
  • nixVersions.latest (nixVersions.nix_2_28)
  • nixVersions.latest.dev (nixVersions.nix_2_28.dev)
  • nixVersions.latest.doc (nixVersions.nix_2_28.doc)
  • nixVersions.latest.man (nixVersions.nix_2_28.man)

@roberth roberth merged commit 64dafff into NixOS:master Apr 7, 2025
57 of 59 checks passed
@Mic92 Mic92 deleted the nix-version branch April 7, 2025 12:07
SuperSandro2000
SuperSandro2000 reviewed Apr 7, 2025
View reviewed changes
pkgs/tools/package-management/nix/default.nix
Copy link
Member

@SuperSandro2000 SuperSandro2000 Apr 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While cherry-picking I noticed that the 2nd commit introduced a bit wrong syntax which was then fixed in the 3rd 🙈

We are in no rush. Please take your time. :)

Copy link
Member Author

@Mic92 Mic92 Apr 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must have been happen while splitting commits. I had the second and third commit in one first.

@misuzu
Copy link
Contributor

misuzu commented Apr 9, 2025

nix 2.28 doesn't cross compile:

% nix-build . -A pkgsCross.aarch64-multiplatform.nixVersions.latest
<..................>

Executing subproject libmain-c

libmain-c| Project name: nix-main-c
libmain-c| Project version: 2.28.1
libmain-c| C++ compiler for the host machine: aarch64-unknown-linux-gnu-g++ (gcc 14.2.1 "aarch64-unknown-linux-gnu-g++ (GCC) 14.2.1 20241116")
libmain-c| C++ linker for the host machine: aarch64-unknown-linux-gnu-g++ ld.bfd 2.43.1
libmain-c| Compiler for language cpp for the build machine not found.
libmain-c| Dependency nix-util found: YES 2.28.1 (overridden)
libmain-c| Dependency nix-store found: YES 2.28.1 (overridden)
libmain-c| Dependency nix-main found: YES 2.28.1 (overridden)
libmain-c| Dependency nix-util-c found: YES 2.28.1 (overridden)
libmain-c| Dependency nix-store-c found: YES 2.28.1 (overridden)
libmain-c| Dependency threads found: YES unknown (cached)
libmain-c| Build targets in project: 27
libmain-c| Subproject libmain-c finished.


Executing subproject libutil-test-support

libutil-test-support| Project name: nix-util-test-support
libutil-test-support| Project version: 2.28.1
libutil-test-support| C++ compiler for the host machine: aarch64-unknown-linux-gnu-g++ (gcc 14.2.1 "aarch64-unknown-linux-gnu-g++ (GCC) 14.2.1 20241116")
libutil-test-support| C++ linker for the host machine: aarch64-unknown-linux-gnu-g++ ld.bfd 2.43.1
libutil-test-support| Compiler for language cpp for the build machine not found.
libutil-test-support| Dependency nix-util found: YES 2.28.1 (overridden)
libutil-test-support| Dependency nix-util-c found: YES 2.28.1 (overridden)
libutil-test-support| Run-time dependency rapidcheck found: NO (tried pkgconfig and cmake)

src/libutil-test-support/meson.build:25:13: ERROR: Dependency "rapidcheck" not found, tried pkgconfig and cmake

A full log can be found at /build/source/build/meson-logs/meson-log.txt

@roberth
Copy link
Member

roberth commented Apr 9, 2025

This seems to be a problem with the new monolithic packaging introduced in #393509.
For contrast, nix-build -A nixVersions.git --argstr crossSystem aarch64-linux works.
It seems that the test-related subprojects are attempted to be built, which they shouldn't.

roberth added a commit to roberth/nixpkgs that referenced this pull request Apr 9, 2025
@roberth
nix: Fix cross
8707630 
Introduced in
- NixOS#393509
- and NixOS#396773
@roberth
Copy link
Member

roberth commented Apr 9, 2025

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@roberth roberth roberth approved these changes

@tomberek tomberek Awaiting requested review from tomberek

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@edolstra edolstra Awaiting requested review from edolstra

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Mic92 @misuzu @roberth @SuperSandro2000