diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-13 10:03:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 10:03:26 +0200 |
| commit | 3a53eaee3fd2c23cdc6d458e9f586fd380702a38 (patch) | |
| tree | eee2cf8267af7821be410dfda635a0c619be8156 /pkgs | |
| parent | c5a8bae88b65e2af39675a2b48ce3001d6f8e894 (diff) | |
| parent | 8b99f45d2b1dabd795d4e1112abe666716dda66f (diff) | |
Merge pull request #319327 from amarshall/bitwarden-update
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/bi/bitwarden-desktop/package.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 9ae3e52f3b943..f10ef5d4178b6 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,7 +3,7 @@ , cargo , copyDesktopItems , dbus -, electron_28 +, electron_29 , fetchFromGitHub , glib , gnome @@ -14,7 +14,7 @@ , makeWrapper , moreutils , napi-rs-cli -, nodejs_18 +, nodejs_20 , patchutils_0_4_2 , pkg-config , python3 @@ -24,18 +24,18 @@ }: let - description = "A secure and free password manager for all of your devices"; + description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_28; + electron = electron_29; in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.5.0"; + version = "2024.6.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-ozR46snGD5yl98FslmnTeQmd2on/0bQPEnqJ0t8wx70="; + hash = "sha256-qiUUrs23WHE3+KFsWDknuDSA6M3Zwjz9Jdjq6mn5XkE="; }; patches = [ @@ -55,12 +55,12 @@ in buildNpmPackage rec { | ${moreutils}/bin/sponge apps/desktop/src/package-lock.json ''; - nodejs = nodejs_18; + nodejs = nodejs_20; makeCacheWritable = true; - npmFlags = [ "--legacy-peer-deps" ]; + npmFlags = [ "--engine-strict" "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-gprJGOE/uSSM3NHpcbelB7sueObEl4o522WRHIRFmwo="; + npmDepsHash = "sha256-Mgd15eFJtWoBqFFCsjmsnlNbcg5NDs1U7DlMkE0hIb8="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -76,7 +76,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-FA7B+bipYSxwIGvn/v9+wG3Km6lrwV58LbxsMlDK8q0="; + hash = "sha256-BL+j2hMwb3QGgS29Y6LjqnKscH+tEXMCOyivilHHwVI="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -159,7 +159,7 @@ in buildNpmPackage rec { cp -r locales resources{,.pak} $out/opt/Bitwarden popd - makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \ + makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \ --add-flags $out/opt/Bitwarden/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_IS_DEV 0 \ |