Skip to content

bitwarden-desktop: 2024.12.1 -> 2025.1.1 #374021

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

Merged
talyz merged 1 commit into from
Jan 24, 2025
Merged

bitwarden-desktop: 2024.12.1 -> 2025.1.1 #374021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions pkgs/by-name/bi/bitwarden-desktop/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
buildNpmPackage,
cargo,
copyDesktopItems,
electron_32,
electron_33,
fetchFromGitHub,
glib,
gnome-keyring,
gtk3,
jq,
libsecret,
makeDesktopItem,
makeWrapper,
napi-rs-cli,
Expand All @@ -26,7 +23,7 @@
let
description = "Secure and free password manager for all of your devices";
icon = "bitwarden";
electron = electron_32;
electron = electron_33;

bitwardenDesktopNativeArch =
{
Expand All @@ -39,13 +36,13 @@ let
in
buildNpmPackage rec {
pname = "bitwarden-desktop";
version = "2024.12.1";
version = "2025.1.1";

src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-nmQUfVhSJrnYWbxjNk0r6vEtPqA8kksEX5gUmpeKe6M=";
hash = "sha256-0NXrTBkCyo9Hw+fyFTfXfa1efBlaM6xWd9Uvsbathpw=";
};

patches = [
Expand All @@ -70,7 +67,7 @@ buildNpmPackage rec {
"--legacy-peer-deps"
];
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-5rOA7xtw2jqjoLxEl4lsLWpv32/TYmEaK+UN7R8EoJc=";
npmDepsHash = "sha256-DDsPkvLGOhjmdYEOmhZfe4XHGFyowvWO24YcCA5griM=";

cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
Expand All @@ -82,7 +79,7 @@ buildNpmPackage rec {
) patches;
patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-Fh6pbmFof/qIhVETtBA1fGlC45fuu1n7g9hosvmfHZc=";
hash = "sha256-IL8+n+rhRbvRO1jxJSy9PjUMb/tI4S/gzpUNOojBPWk=";
};
cargoRoot = "apps/desktop/desktop_native";

Expand All @@ -100,12 +97,6 @@ buildNpmPackage rec {
rustPlatform.cargoSetupHook
];

buildInputs = [
glib
gtk3
libsecret
];

preBuild = ''
if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
echo 'ERROR: electron version mismatch'
Expand Down