From e4999e399377a32686a80cac56f65bf798237529 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 19 Jan 2024 12:52:40 -0500 Subject: [PATCH 1/5] bitwarden: remove unused patch --- .../security/bitwarden/electron-27.patch | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 pkgs/tools/security/bitwarden/electron-27.patch diff --git a/pkgs/tools/security/bitwarden/electron-27.patch b/pkgs/tools/security/bitwarden/electron-27.patch deleted file mode 100644 index 5b2af2ce30f4..000000000000 --- a/pkgs/tools/security/bitwarden/electron-27.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e2c15e826fe9d4d2d12868ef5409e423e3191b58 Mon Sep 17 00:00:00 2001 -From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> -Date: Fri, 8 Dec 2023 13:07:46 +0100 -Subject: [PATCH] Bump electron to v27.1.3 (#7134) - -Co-authored-by: Daniel James Smith - -(cherry picked from commit d76602343f36d8e17a9b0204e0290488456c96d5) ---- - apps/desktop/electron-builder.json | 2 +- - package-lock.json | 8 ++++---- - package.json | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json -index 69d1c0074f..a12870bd96 100644 ---- a/apps/desktop/electron-builder.json -+++ b/apps/desktop/electron-builder.json -@@ -19,7 +19,7 @@ - "**/node_modules/@bitwarden/desktop-native/index.js", - "**/node_modules/@bitwarden/desktop-native/desktop_native.${platform}-${arch}*.node" - ], -- "electronVersion": "25.9.1", -+ "electronVersion": "27.1.3", - "generateUpdatesFilesForAllChannels": true, - "publish": { - "provider": "generic", -diff --git a/package-lock.json b/package-lock.json -index 3f0afde95b..9b7b2dbcd9 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -125,7 +125,7 @@ - "cross-env": "7.0.3", - "css-loader": "6.8.1", - "del": "6.1.1", -- "electron": "25.9.1", -+ "electron": "27.1.3", - "electron-builder": "23.6.0", - "electron-log": "5.0.0", - "electron-reload": "2.0.0-alpha.1", -@@ -20173,9 +20173,9 @@ - } - }, - "node_modules/electron": { -- "version": "25.9.1", -- "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", -- "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", -+ "version": "27.1.3", -+ "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.3.tgz", -+ "integrity": "sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==", - "dev": true, - "hasInstallScript": true, - "dependencies": { -diff --git a/package.json b/package.json -index 9ee884b31d..4a5c3513fd 100644 ---- a/package.json -+++ b/package.json -@@ -88,7 +88,7 @@ - "cross-env": "7.0.3", - "css-loader": "6.8.1", - "del": "6.1.1", -- "electron": "25.9.1", -+ "electron": "27.1.3", - "electron-builder": "23.6.0", - "electron-log": "5.0.0", - "electron-reload": "2.0.0-alpha.1", --- -2.42.0 - From eec60b7f3cdcbdd41baf90e9b7e3a9247709eae0 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 25 Feb 2024 22:16:54 -0500 Subject: [PATCH 2/5] bitwarden: move to pkgs/by-name --- .../bitwarden/default.nix => by-name/bi/bitwarden/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/bitwarden/default.nix => by-name/bi/bitwarden/package.nix} (100%) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/by-name/bi/bitwarden/package.nix similarity index 100% rename from pkgs/tools/security/bitwarden/default.nix rename to pkgs/by-name/bi/bitwarden/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e351d8e7fb5..5cdd353de596 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3552,8 +3552,6 @@ with pkgs; biscuit-cli = callPackage ../tools/security/biscuit-cli { }; - bitwarden = callPackage ../tools/security/bitwarden { }; - bitwarden-cli = callPackage ../tools/security/bitwarden/cli.nix { }; inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector; From 0187d7e4f40ea2bc8c16f6826d5b4e99da534184 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 25 Feb 2024 22:17:33 -0500 Subject: [PATCH 3/5] bitwarden-cli: move to pkgs/by-name --- .../bitwarden/cli.nix => by-name/bi/bitwarden-cli/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/bitwarden/cli.nix => by-name/bi/bitwarden-cli/package.nix} (100%) diff --git a/pkgs/tools/security/bitwarden/cli.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix similarity index 100% rename from pkgs/tools/security/bitwarden/cli.nix rename to pkgs/by-name/bi/bitwarden-cli/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cdd353de596..752977f93f97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3552,8 +3552,6 @@ with pkgs; biscuit-cli = callPackage ../tools/security/biscuit-cli { }; - bitwarden-cli = callPackage ../tools/security/bitwarden/cli.nix { }; - inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector; bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { }; From 4ff953a95a63cf5baf3583c515dd387f1e189fb7 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 19 Jan 2024 12:51:09 -0500 Subject: [PATCH 4/5] bitwarden-desktop: rename from bitwarden MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream calls it Bitwarden Desktop, and we have other “bitwarden-*” packages, so having an unsuffixed one can be confusing. I assume the hash for cargoDeps is changing since it encodes the pname. --- pkgs/by-name/bi/{bitwarden => bitwarden-desktop}/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/by-name/bi/{bitwarden => bitwarden-desktop}/package.nix (97%) diff --git a/pkgs/by-name/bi/bitwarden/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix similarity index 97% rename from pkgs/by-name/bi/bitwarden/package.nix rename to pkgs/by-name/bi/bitwarden-desktop/package.nix index 5ed43dc6b3b6..bbeda629824e 100644 --- a/pkgs/by-name/bi/bitwarden/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -29,7 +29,7 @@ let icon = "bitwarden"; electron = electron_28; in buildNpmPackage rec { - pname = "bitwarden"; + pname = "bitwarden-desktop"; version = "2024.2.0"; src = fetchFromGitHub { @@ -68,7 +68,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-KJUz5hvdsurnohUWRZedXvuWMnLtR0dcdTeHtJGrZBs="; + hash = "sha256-LjwtOmIJlwtOiy36Y0pP+jJEwfmCGTN4RhqgmD3Yj6E="; }; cargoRoot = "apps/desktop/desktop_native"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5a44235de0c3..2ae67d10a7b9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -102,6 +102,7 @@ mapAliases ({ beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08 binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 bird2 = bird; # Added 2022-02-21 + bitwarden = bitwarden-desktop; # Added 2024-02-25 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 blender-with-packages = args: From b491aad7b36bc58ae4e85f9b18ebaee7b80d0930 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 25 Feb 2024 13:56:20 -0500 Subject: [PATCH 5/5] bitwarden-desktop: replace patch with upstream URL ...since it is now merged. The patches are equivalent, so the hash is unchanged. --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index bbeda629824e..c2d3f04db7d5 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -41,8 +41,7 @@ in buildNpmPackage rec { patches = [ (fetchpatch2 { - # https://github.com/bitwarden/clients/pull/7508 - url = "https://github.com/amarshall/bitwarden-clients/commit/e85fa4ef610d9dd05bd22a9b93d54b0c7901776d.patch"; + url = "https://github.com/bitwarden/clients/commit/746bf0a4745423b9e70c2c54dcf76a95ffb62e11.patch"; hash = "sha256-P9MTsiNbAb2kKo/PasIm9kGm0lQjuVUxAJ3Fh1DfpzY="; }) ];