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.

Sign up for GitHub

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

Jump to bottom

bitwarden: fix build; 2023.12.0 -> 2023.12.1 #278289

Merged
merged 2 commits into from
Jan 2, 2024
Merged

bitwarden: fix build; 2023.12.0 -> 2023.12.1 #278289

merged 2 commits into from
Jan 2, 2024

Conversation

amarshall
Copy link
Member

@amarshall amarshall commented Jan 2, 2024 •
edited by dotlambda
Loading

Description of changes

See commit message for details. Cherry-picked upgrade commit from #277134 for simplicity.

closes #277134

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.05 Release Notes (or backporting 23.05 and 23.11 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.

amarshall and others added 2 commits January 2, 2024 09:36
@amarshall
bitwarden: Filter patches for cargo sourceRoot
9201c2e 
Since we pass `sourceRoot` to `fetchCargoTarball`, any patches that
affect files outside of that `sourceRoot` will fail to apply. So map
each patch to remove any diff hunks outside that `sourceRoot`.

This was only working before due to the FOD being cached from before
such problematic patches were added (in commit
333dadb).
@dotlambda @amarshall
bitwarden: 2023.12.0 -> 2023.12.1
31928d0 
Diff: bitwarden/clients@desktop-v2023.12.0...desktop-v2023.12.1

Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2023.12.1
@amarshall amarshall requested a review from dotlambda January 2, 2024 14:53
@amarshall amarshall mentioned this pull request Jan 2, 2024
Closed
13 tasks
@ofborg ofborg bot requested a review from Kiwi January 2, 2024 16:13
@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 Jan 2, 2024
@dotlambda dotlambda merged commit 4e44fb9 into NixOS:master Jan 2, 2024
27 of 28 checks passed
@github-actions github-actions bot mentioned this pull request Jan 2, 2024
Merged
1 task
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 2, 2024

Successfully created backport PR for release-23.11:

@amarshall amarshall deleted the bitwarden-update branch January 2, 2024 22:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda Awaiting requested review from dotlambda

@Kiwi Kiwi Awaiting requested review from Kiwi

Assignees
No one assigned
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 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@amarshall @dotlambda