Skip to content
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

nixVersions.nix_2_24: 2.24.2 -> 2.24.3 #336076

Merged
merged 1 commit into from
Aug 20, 2024

Conversation

philiptaron
Copy link
Contributor

@philiptaron philiptaron commented Aug 20, 2024

Description of changes

Just the most recently tagged Nix 2.24 release.

Changes: NixOS/nix@2.24.2...2.24.3

The substantial change is for Darwin sandbox (cc @emilazy):

  • NixOS/nix@4e707b8 libstore: fix port binding in __darwinAllowLocalNetworking sandbox

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@philiptaron
Copy link
Contributor Author

Result of nixpkgs-review pr 336076 run on x86_64-linux 1

11 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.latest
  • nixVersions.latest.debug
  • nixVersions.latest.dev
  • nixVersions.latest.doc
  • nixVersions.latest.man

@philiptaron philiptaron requested a review from Mic92 August 20, 2024 14:50
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Darwin fix is good.

@Mic92
Copy link
Member

Mic92 commented Aug 20, 2024

Result of nixpkgs-review pr 336076 run on x86_64-linux 1

11 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.latest
  • nixVersions.latest.debug
  • nixVersions.latest.dev
  • nixVersions.latest.doc
  • nixVersions.latest.man

@Mic92
Copy link
Member

Mic92 commented Aug 20, 2024

Result of nixpkgs-review pr 336076 run on aarch64-linux 1

11 packages built:
  • colmena
  • harmonia
  • nil
  • nix-eval-jobs
  • nix-fast-build
  • nix-fast-build.dist
  • nixVersions.latest (nixVersions.nix_2_24)
  • nixVersions.latest.debug (nixVersions.nix_2_24.debug)
  • nixVersions.latest.dev (nixVersions.nix_2_24.dev)
  • nixVersions.latest.doc (nixVersions.nix_2_24.doc)
  • nixVersions.latest.man (nixVersions.nix_2_24.man)

@Mic92 Mic92 merged commit 53659de into NixOS:master Aug 20, 2024
29 of 31 checks passed
@JohnRTitor
Copy link
Contributor

Isn't the @NixOS/nix-team is supposed to be "code owner" rather than RaitoBezarius?

@Mic92
Copy link
Member

Mic92 commented Aug 21, 2024

Isn't the @NixOS/nix-team is supposed to be "code owner" rather than RaitoBezarius?

Yes. See #314065 (comment)

@roberth roberth added the backport release-24.05 Backport PR automatically label Aug 22, 2024
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-336076-to-release-24.05 origin/release-24.05
cd .worktree/backport-336076-to-release-24.05
git switch --create backport-336076-to-release-24.05
git cherry-pick -x 0669be90824575c6dde136f52032538b6ae19a69

@philiptaron
Copy link
Contributor Author

Backport already complete in #336108 @roberth

@philiptaron philiptaron removed the backport release-24.05 Backport PR automatically label Aug 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants