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

[Backport release-24.11] nixpkgs-review: 2.12.0 -> 3.0.1 #373534

Merged

Conversation

niklaskorz
Copy link
Contributor

@niklaskorz niklaskorz commented Jan 13, 2025

Backport of #366587 and #370816 (combined in one manual cherry-pick PR so we don't have two separate backport PRs).

Motivation: nixpkgs-review 2.x relies on the ofborg cache and at least for me does not fallback to local evaluation anymore when it does not find the cached ofborg evaluation, which is the case for all new nixpkgs PRs.
Discussion on Matrix.

This leaves 2.x in a somewhat broken state and can cause confusion for reviewers using stable. nixpkgs-review 3.x is required to fetch the evaluation cache of the new Github Actions evaluation.

@emilazy fittingly described it in a joking way: "nixpkgs-review is a live service game".

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.

@niklaskorz niklaskorz changed the base branch from master to release-24.11 January 13, 2025 19:41
@github-actions github-actions bot added 6.topic: python 8.has: documentation This PR adds or changes documentation 6.topic: rust 6.topic: policy discussion 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: module system About "NixOS" module system internals 6.topic: flakes The experimental Nix feature 6.topic: lib The Nixpkgs function library 6.topic: dotnet Language: .NET 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Jan 13, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 13, 2025
@github-actions github-actions bot removed 6.topic: python 8.has: documentation This PR adds or changes documentation 6.topic: rust 6.topic: policy discussion 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: module system About "NixOS" module system internals 6.topic: flakes The experimental Nix feature 6.topic: lib The Nixpkgs function library 6.topic: dotnet Language: .NET 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Jan 13, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 13, 2025
@niklaskorz
Copy link
Contributor Author

Today I learnt: pressing enter while editing the title of a Github PR creates it, which happened before I changed the base branch. :) Good thing mass pings are a thing of the past.

Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

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

Thanks for this, it's been a little annoying on my server 😆

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 373534


aarch64-linux

✅ 4 packages built:
  • nix-update
  • nix-update.dist
  • nixpkgs-review
  • nixpkgs-review.dist

x86_64-darwin

✅ 4 packages built:
  • nix-update
  • nix-update.dist
  • nixpkgs-review
  • nixpkgs-review.dist

aarch64-darwin

✅ 4 packages built:
  • nix-update
  • nix-update.dist
  • nixpkgs-review
  • nixpkgs-review.dist

@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 13, 2025
@FliegendeWurst FliegendeWurst mentioned this pull request Jan 13, 2025
13 tasks
@FliegendeWurst FliegendeWurst added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Jan 13, 2025
@FliegendeWurst FliegendeWurst merged commit 833f97a into NixOS:release-24.11 Jan 13, 2025
91 of 94 checks passed
@imincik
Copy link
Contributor

imincik commented Jan 14, 2025

Great thanks for backporting. I just hit the issue with ofborg cache .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants