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

cryptomator: 1.14.1 -> 1.14.2, unbreak #357433

Merged
merged 5 commits into from
Nov 20, 2024
Merged

Conversation

gepbird
Copy link
Contributor

@gepbird gepbird commented Nov 20, 2024

Fixes build failure caused by #344544

ZHF: #352882

The upstream patch is based on the develop branch, and its not compatible with 1.14.2 therefore I had to vendor it.

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.

@gepbird gepbird added 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 6.topic: java Including JDK, tooling, other languages, other VMs labels Nov 20, 2024
@github-actions github-actions bot removed the 6.topic: java Including JDK, tooling, other languages, other VMs label Nov 20, 2024
@ofborg ofborg bot requested a review from bachp November 20, 2024 19:54
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 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 Nov 20, 2024
@bachp
Copy link
Member

bachp commented Nov 20, 2024

Looks good, thanks for fixing this upstream. I will do a test run and then merge.

@bachp bachp merged commit 4927639 into NixOS:master Nov 20, 2024
47 of 49 checks passed
@gepbird gepbird deleted the cryptomator-fix branch November 20, 2024 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 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.

2 participants