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

nc4nix: 0-unstable-2024-03-01 -> 0-unstable-2024-05-24; nextcloudPackages: update #326442

Merged
merged 3 commits into from
Jul 12, 2024

Conversation

pyrox0
Copy link
Member

@pyrox0 pyrox0 commented Jul 12, 2024

Updates nc2nix to include a commit that generates SRI hashes instead of sha256 hashes for extensions.

Also updates the nextcloud2{8,9}Packages package sets, in order to have those new hashes. This causes no rebuilds of the derivations besides those that are updated.
Note that out-of-tree usages of fetchNextcloudApp will not throw an error with sha256, but this is one step towards being able to do that(per #325892)

Description of changes

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.

@pyrox0 pyrox0 changed the title nc4nix: 0-unstable-2024-03-01 -> 0-unstable-2024-05-24 nc4nix: 0-unstable-2024-03-01 -> 0-unstable-2024-05-24; nextcloudPackages: update Jul 12, 2024
pyrox0 added 3 commits July 12, 2024 01:03
Updates mainly to include a commit that generates SRI hashes instead of
sha256 hashes for extensions.
@ofborg ofborg bot requested a review from onny July 12, 2024 05:36
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jul 12, 2024
@onny
Copy link
Contributor

onny commented Jul 12, 2024

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

1 package built:
  • nc4nix

@onny onny merged commit a7885a6 into NixOS:master Jul 12, 2024
29 of 31 checks passed
@onny
Copy link
Contributor

onny commented Jul 12, 2024

This is great, thank you :)

@dotlambda
Copy link
Member

This causes no rebuilds of the derivations besides those that are updated.

Quite the opposite. It causes everything to fail to build. How was this not even tested??

@alois31
Copy link
Contributor

alois31 commented Jul 14, 2024

This causes no rebuilds of the derivations besides those that are updated.

Quite the opposite. It causes everything to fail to build. How was this not even tested??

Testing does not help for FODs when the thing with the specified hash (in this case, the zip file fetched by upstream nc4nix) is already in the store.

@dotlambda
Copy link
Member

This causes no rebuilds of the derivations besides those that are updated.

Quite the opposite. It causes everything to fail to build. How was this not even tested??

Testing does not help for FODs when the thing with the specified hash (in this case, the zip file fetched by upstream nc4nix) is already in the store.

But it's not. The hashes aren't the same.

@alois31
Copy link
Contributor

alois31 commented Jul 14, 2024

But it's not. The hashes aren't the same.

Upstream nc4nix uses fetchurl, which does not uncompress the file, while nixpkgs uses fetchzip, which does. So the hashes are going to be different, but you aren't going to notice that when you already had the zip file in the store because you used upstream nc4nix.

@dotlambda
Copy link
Member

But it's not. The hashes aren't the same.

Upstream nc4nix uses fetchurl, which does not uncompress the file, while nixpkgs uses fetchzip, which does. So the hashes are going to be different, but you aren't going to notice that when you already had the zip file in the store because you used upstream nc4nix.

That doesn't excuse @onny merging this without testing.

@pyrox0
Copy link
Member Author

pyrox0 commented Jul 14, 2024

I pushed an updated one that mimics fetchzip, please go to that. I apologize for not testing this more thoroughly, but what's done is done.

#326947

@pyrox0 pyrox0 deleted the nc4nix-update branch August 4, 2024 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants