nsncd: unstable-2024-03-18 -> unstable-2024-08-06#332688
Merged
yu-re-ka merged 2 commits intoNixOS:staging-nextfrom Aug 7, 2024
Merged
nsncd: unstable-2024-03-18 -> unstable-2024-08-06#332688yu-re-ka merged 2 commits intoNixOS:staging-nextfrom
yu-re-ka merged 2 commits intoNixOS:staging-nextfrom
Conversation
Member
|
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. |
Member
|
Let's start by reverting, anyway, because we definitely don't want to end up with the downgrade: #332692. |
ofborg
bot
added
11.by: package-maintainer
alyssais
added
the
2.status: merge conflict
picnoir
force-pushed
the
picnoir/nsncd-update
branch
2 times, most recently
from
c9b27df to
edd2097
Compare
Member
Author
|
@alyssais PTAL |
alyssais
reviewed
Aug 6, 2024
picnoir
force-pushed
the
picnoir/nsncd-update
branch
from
edd2097 to
330d103
Compare
alyssais
approved these changes
Aug 6, 2024
flokli
approved these changes
Aug 6, 2024
Member
|
Oh, commit message is not in the right format. I'll just fix that with Squash and Merge. |
alyssais
changed the title
ofborg
bot
removed
the
2.status: merge conflict
Member
Author
|
Duh, sorry about that. Forgot to check what was the previous version after your revert… |
picnoir
force-pushed
the
picnoir/nsncd-update
branch
from
990f7fa to
ecdd1e6
Compare
vcunat
requested changes
Aug 7, 2024
Member
vcunat
left a comment
vcunat
left a comment
There was a problem hiding this comment.
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=
Member
Author
|
Changing the program version name changes the cargo vendor hash. TIL. |
Fixes nsncd for rustc > 1.80. Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
picnoir
force-pushed
the
picnoir/nsncd-update
branch
from
ecdd1e6 to
65038ab
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
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
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.