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

bitwarden-desktop: 2025.1.1 -> 2025.2.0 #381008

Merged
merged 2 commits into from
Feb 19, 2025

Conversation

bobvanderlinden
Copy link
Member

@bobvanderlinden bobvanderlinden commented Feb 10, 2025

See releases 2025.1.2, 2025.1.3 and 2025.1.4:

https://github.com/bitwarden/clients/releases?q=desktop-&expanded=true

Basically bug fixes and dependency updates.

Amongst the dependency updates are vite and esbuild. Both vite and bitwarden-desktop depend on different versions of esbuild. esbuild tries to download its binaries, but fails. Alternatively ESBUILD_BINARY_PATH can be used to skip the download. Setting this to one version of esbuild will fail the vite esbuild, setting this to another will fail the bitwarden-desktop esbuild. There need to be 2 versions of esbuild being used during the npm rebuild.

I've split the npm rebuild step into two. One rebuilds the dependencies vite and electron and thus skipping a rebuild of bitwarden-desktop. This is done by specifying the dependencies to rebuild explicitly in npmRebuildFlags. In preBuild, npm rebuild . is used for bitwarden-desktop only. This way ESBUILD_BINARY_PATH can be specified separately with different versions.

I also needed to update the biometrics patching, as the biometrics file has been renamed (biometric.unix.main.ts -> os-biometrics-linux.service.ts).

I'm still hoping this can be resolved in a nicer way, but I haven't figured this out yet.

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.

@bobvanderlinden bobvanderlinden changed the title bitwarden: 2025.1.1 -> 2025.1.4 bitwarden-desktop: 2025.1.1 -> 2025.1.4 Feb 10, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels Feb 10, 2025
@nix-owners nix-owners bot requested a review from amarshall February 10, 2025 22:23
@dotlambda
Copy link
Member

I'm still hoping this can be resolved in a nicer way, but I haven't figured this out yet.

Not nicer, but easier: https://github.com/NixOS/nixpkgs/pull/376765/files#diff-cea960104b987ac2db5ca35c8d5b44c48c9dbe142f77b8b3526d01c64b1f896dR56

@Elias-Graf
Copy link

Elias-Graf commented Feb 11, 2025

This should enable the ssh-agent support (https://bitwarden.com/help/ssh-agent/), correct?

Edit: I've just tested it, it works! 🎉

@bobvanderlinden
Copy link
Member Author

I'm still hoping this can be resolved in a nicer way, but I haven't figured this out yet.

Not nicer, but easier: #376765 (files)

Oo, good suggestion. I like this better than the double-versioned esbuild. Replaced it with the easier solution.

@ddogfoodd
Copy link
Contributor

as it's not merged yet, maybe even update to 2025.2.0? Or is there a reason to separate into another PR?

@bobvanderlinden bobvanderlinden changed the title bitwarden-desktop: 2025.1.1 -> 2025.1.4 bitwarden-desktop: 2025.1.1 -> 2025.2.0 Feb 19, 2025
@bobvanderlinden
Copy link
Member Author

I've updated the package to 2025.2.0 👍

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested locally, works as expected

@SuperSandro2000 SuperSandro2000 merged commit b4ac798 into NixOS:master Feb 19, 2025
24 of 27 checks passed
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.

5 participants