gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bitwarden-desktop: 2025.1.1 -> 2025.2.0 (#381008)

Browse Source 
* bitwarden-desktop: 2025.1.1 -> 2025.2.0

* bitwarden-desktop: remove unused inputs

---------

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Bob van der Linden
2025-02-19 21:38:26 +01:00
committed by GitHub
co-authored by Sandro
parent d7d08f7fa2
commit b4ac7980bc
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts
index 8962e7f3ec..a7291420f2 100644
--- a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts
+++ b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts
@@ -109,7 +109,7 @@ export default class BiometricUnixMain implements OsBiometricService {
diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
index 791b4d6f88..dfee0bbf8d 100644
--- a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
@@ -115,7 +115,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService {
// The user needs to manually set up the polkit policy outside of the sandbox
// since we allow access to polkit via dbus for the sandboxed clients, the authentication works from
// the sandbox, once the policy is set up outside of the sandbox.
pkgs/by-name/bi/bitwarden-desktop/package.nix
+12 -7
View File
@@ -3,7 +3,7 @@
buildNpmPackage,
cargo,
copyDesktopItems,
electron_33,
electron_34,
fetchFromGitHub,
gnome-keyring,
jq,
@@ -23,7 +23,7 @@
let
description = "Secure and free password manager for all of your devices";
icon = "bitwarden";
electron = electron_33;
electron = electron_34;
bitwardenDesktopNativeArch =
{
@@ -36,13 +36,13 @@ let
in
buildNpmPackage rec {
pname = "bitwarden-desktop";
version = "2025.1.1";
version = "2025.2.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-0NXrTBkCyo9Hw+fyFTfXfa1efBlaM6xWd9Uvsbathpw=";
hash = "sha256-+RMeo+Kyum1WNm7citUe9Uk5yOtfhMPPlQRtnYL3Pj8=";
};
patches = [
@@ -66,8 +66,13 @@ buildNpmPackage rec {
"--engine-strict"
"--legacy-peer-deps"
];
npmRebuildFlags = [
# FIXME one of the esbuild versions fails to download @esbuild/linux-x64
"--ignore-scripts"
];
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-DDsPkvLGOhjmdYEOmhZfe4XHGFyowvWO24YcCA5griM=";
npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs=";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
@@ -79,7 +84,7 @@ buildNpmPackage rec {
) patches;
patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-IL8+n+rhRbvRO1jxJSy9PjUMb/tI4S/gzpUNOojBPWk=";
hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc=";
};
cargoRoot = "apps/desktop/desktop_native";
@@ -162,7 +167,7 @@ buildNpmPackage rec {
# This may break in the future but its better than copy-pasting it manually.
mkdir -p $out/share/polkit-1/actions/
pushd apps/desktop/src/key-management/biometrics
awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' biometric.unix.main.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
popd
pushd apps/desktop/resources/icons