From 53798cb041520b465227a8e983cd82988e68a35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 Dec 2024 11:53:03 -0800 Subject: [PATCH 1/3] bitwarden-desktop: 2024.11.1 -> 2024.12.0 Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.11.1...desktop-v2024.12.0 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.12.0 (cherry picked from commit a3fece4553aa99cfbf700dd6ca3fe3b2b3105161) --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 3fb82ab0dd2b2..7822969ea1128 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -17,7 +17,6 @@ nodejs_20, patchutils_0_4_2, pkg-config, - python3, runCommand, rustc, rustPlatform, @@ -40,13 +39,13 @@ let in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.11.1"; + version = "2024.12.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-4QTQgW8k3EMf07Xqs2B+VXQOUPzoOgaNvoC02x4zvu8="; + hash = "sha256-1XzIrZOTcFEuY/WqPGcFESBAZOiFcHA4ZvGXhDM7a54="; }; patches = [ @@ -71,11 +70,10 @@ buildNpmPackage rec { "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-YzhCyNMvfXGmgOpl3qWj1Pqd1hY8CJ9QLwQds5ZMnqg="; + npmDepsHash = "sha256-EtIcqbubAYN9I9wbw17oHiVshd3GtQayFtdgqWP7Pgg="; - cargoDeps = rustPlatform.fetchCargoTarball { - name = "${pname}-${version}"; - inherit src; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; patches = map ( patch: runCommand (builtins.baseNameOf patch) { nativeBuildInputs = [ patchutils_0_4_2 ]; } '' @@ -84,7 +82,7 @@ buildNpmPackage rec { ) patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-aurjpVzWET30O+ysyE4ZzauMe8kHjOL169tfKUR1Vpg="; + hash = "sha256-Fh6pbmFof/qIhVETtBA1fGlC45fuu1n7g9hosvmfHZc="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -97,7 +95,6 @@ buildNpmPackage rec { makeWrapper napi-rs-cli pkg-config - (python3.withPackages (ps: with ps; [ setuptools ])) rustc rustPlatform.cargoCheckHook rustPlatform.cargoSetupHook From 5c255f4025ec39c8e78086a715ee2a6e3cbf0310 Mon Sep 17 00:00:00 2001 From: patka Date: Sun, 12 Jan 2025 13:22:20 +0100 Subject: [PATCH 2/3] bitwarden-desktop: 2024.12.0 -> 2024.12.1 release notes: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.12.1 (cherry picked from commit d32d08c1255523d266033f08a2e6cacb8601ec52) --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 7822969ea1128..1979b83fedc03 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -39,13 +39,13 @@ let in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.12.0"; + version = "2024.12.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-1XzIrZOTcFEuY/WqPGcFESBAZOiFcHA4ZvGXhDM7a54="; + hash = "sha256-nmQUfVhSJrnYWbxjNk0r6vEtPqA8kksEX5gUmpeKe6M="; }; patches = [ @@ -70,7 +70,7 @@ buildNpmPackage rec { "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-EtIcqbubAYN9I9wbw17oHiVshd3GtQayFtdgqWP7Pgg="; + npmDepsHash = "sha256-5rOA7xtw2jqjoLxEl4lsLWpv32/TYmEaK+UN7R8EoJc="; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; From fc844b1da7c8e3dd1381addca2076cb22f85a0fe Mon Sep 17 00:00:00 2001 From: Saeverix Date: Wed, 15 Jan 2025 12:08:57 +0100 Subject: [PATCH 3/3] bitwarden-desktop: 2024.12.1 -> 2025.1.1 Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.12.1...desktop-v2025.1.1 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2025.1.1 (cherry picked from commit 23c1d61b2b23d574805bfecebe8221eb561e2053) --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 1979b83fedc03..145dd67ee951c 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,13 +3,10 @@ buildNpmPackage, cargo, copyDesktopItems, - electron_32, + electron_33, fetchFromGitHub, - glib, gnome-keyring, - gtk3, jq, - libsecret, makeDesktopItem, makeWrapper, napi-rs-cli, @@ -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 = { @@ -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 = [ @@ -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; @@ -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"; @@ -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'