nc4nix: 0-unstable-2024-03-01 -> 0-unstable-2024-08-01 #331507
Merged
Conversation
This file contains 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
This reverts commit 0fde477.
This reverts commit 4349a61.
Nc4nix now generates SRI hashes instead of sha256 hashes. It also no longer unpacks the tarballs before hashing. Co-authored-by: Pyrox <[email protected]>
We no longer use fetchzip because nc4nix no longer unpacks the tarball before computing the hash.
13 tasks
dotlambda
commented
Aug 1, 2024
| @@ -8,19 +8,12 @@ | |||
| , patches ? [ ] | |||
| , description ? null | |||
| , homepage ? null | |||
| , unpack ? true # whether to use fetchzip rather than fetchurl | |||
There was a problem hiding this comment.
Note that this is a non-breaking change until we set
Suggested change
| , unpack ? true # whether to use fetchzip rather than fetchurl | |
| , unpack ? false # whether to use fetchzip rather than fetchurl |
by default. I suggest we do so, accompanied by release notes, before NixOS 24.11.
There was a problem hiding this comment.
Sounds good 👍
Do you want to file a PR for that?
ofborg
bot
added
10.rebuild-darwin: 0
|
I'd prefer to merge this very soon because it contains an important fix of nextcloud/calendar#6114. |
|
Thanks a lot for taking care of this @dotlambda ! I'm very sorry that I didn't manage to do that myself, this week was just too full so far. Doing a review now. |
Ma27
approved these changes
Aug 2, 2024
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-24.05
git worktree add -d .worktree/backport-331507-to-release-24.05 origin/release-24.05
cd .worktree/backport-331507-to-release-24.05
git switch --create backport-331507-to-release-24.05
git cherry-pick -x 1ad15c918a99581f285f447956fa6e099ea0a889 b8a80e15e5a952b85322ab742d9dc823e9c800b3 73eb537d17631266173c86d40af040c325c79498 2c1d58e90c06d14674c59f7813023b4b71494b32 5c812046c3b38d1c4775fed2e116e0b4537be800 |
|
Expected that. Filing a backport now. |
13 tasks
Ma27
added a commit
that referenced
this pull request
Aug 2, 2024
[24.05] nc4nix: 0-unstable-2024-03-01 -> 0-unstable-2024-08-01 #331507, update nextcloud apps
13 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Here's a bit of a rationale for this change:
In #193075 fetchNextcloudApp was changed to use fetchzip in order to aid reproducability and in helsinki-systems/nc4nix#3 nc4nix followed suit.
In helsinki-systems/nc4nix@3c35a0e nc4nix changed back to hashing the tarballs rather than their content. That's why #326442 left us in a broken state.
The homebrewed bash script that replaced nc4nix in #326947 has its own problems (see that PR), so we should really be using nc4nix again.
As explained in helsinki-systems/nc4nix#3 (comment) I doubt using fetchurl is still an issue (or ever was).
Hence let's use nc4nix again and switch back to fetchurl and be happy :)
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/)closes #330967
Add a 👍 reaction to pull requests you find important.