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

nsncd: unstable-2024-03-18 -> unstable-2024-08-06 #332688

Merged
merged 2 commits into from
Aug 7, 2024

Conversation

picnoir
Copy link
Member

@picnoir picnoir commented Aug 6, 2024

Description of changes

⚠️ Note: this is kind of blocking the next staging merge! We rollbacked by accident Nsncd in staging to a previous version with known bugs.

Continuation of #332176 (comment)

Currently picking the commit from a upstream open PR twosigma/nsncd#119. If upstream end up merging the PR fast enough, it'd make sense to wait for it to be merged.

I'll open a subsequent PR to Nixpkgs to point to the merged PR if they're too slow for us.

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.

Add a 👍 reaction to pull requests you find important.

@picnoir picnoir requested review from flokli and alyssais August 6, 2024 10:37
@alyssais
Copy link
Member

alyssais commented Aug 6, 2024

If upstream is slow, I would rather revert that commit and hold off with the Rust upgrade than depend on fetching a commit that's liable to disappear in future when GitHub GCs.

@alyssais
Copy link
Member

alyssais commented Aug 6, 2024

Let's start by reverting, anyway, because we definitely don't want to end up with the downgrade: #332692.

@picnoir picnoir marked this pull request as draft August 6, 2024 11:36
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Aug 6, 2024
@alyssais alyssais added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 6, 2024
@picnoir picnoir force-pushed the picnoir/nsncd-update branch 2 times, most recently from c9b27df to edd2097 Compare August 6, 2024 16:48
@picnoir picnoir marked this pull request as ready for review August 6, 2024 16:48
@picnoir
Copy link
Member Author

picnoir commented Aug 6, 2024

@alyssais PTAL

@vcunat vcunat changed the base branch from staging to staging-next August 6, 2024 16:57
@alyssais
Copy link
Member

alyssais commented Aug 6, 2024

Oh, commit message is not in the right format. I'll just fix that with Squash and Merge.

@alyssais alyssais changed the title nsncd: unstable-2024-08-06 nsncd: unstable-2024-03-18 -> unstable-2024-08-06 Aug 6, 2024
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 6, 2024
@picnoir
Copy link
Member Author

picnoir commented Aug 6, 2024

Duh, sorry about that. Forgot to check what was the previous version after your revert…

@ofborg ofborg bot requested a review from flokli August 6, 2024 19:58
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

As noted by OfBorg, this PR won't build:

error: hash mismatch in fixed-output derivation '/nix/store/2ykd2ikw45jp1p5ci56q8z5zmrr567pn-nsncd-1.4.1-unstable-2024-04-10-vendor.tar.gz.drv':
         specified: sha256-06fbzx+rqO4k1Cm/UaLk5SRs1wWPSpOG/qCie4c/nPQ=
            got:    sha256-N7U9YsyGh8+fLT973GGZTmVXcdnWhpqkeYTxzJ0rzdo=

@picnoir
Copy link
Member Author

picnoir commented Aug 7, 2024

Changing the program version name changes the cargo vendor hash. TIL.

Fixes nsncd for rustc > 1.80.

Co-authored-by: Sandro <[email protected]>
@yu-re-ka yu-re-ka merged commit 5da5701 into NixOS:staging-next Aug 7, 2024
25 of 27 checks passed
@picnoir picnoir deleted the picnoir/nsncd-update branch August 7, 2024 18:18
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 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants