diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 6f3187cddb27..e4a4ce8a5c2c 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -5,19 +5,20 @@ , fetchFromGitHub , python3 , cctools +, nix-update-script , nixosTests , xcbuild }: buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.8.1"; + version = "2024.8.2"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-l9fLh1YFivVcMs688vM0pHoN0Um2r/EDpo7dvwvZFwY="; + hash = "sha256-F/UbaNKkyf8AoTSa0B0Ipdr5Z8qAkbk7tJ0Cdq7gk+U="; }; postPatch = '' @@ -27,7 +28,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-/6yWdTy6/GvYy8u5eZB+x5KRG6vhPVE0DIn+RUAO5MI="; + npmDepsHash = "sha256-SnrK26QaxHYKX0532rGBASjx9PwxKSsVFRzZ3Cs2GPk="; nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ setuptools ])) @@ -58,8 +59,13 @@ buildNpmPackage rec { npmFlags = [ "--legacy-peer-deps" ]; - passthru.tests = { - vaultwarden = nixosTests.vaultwarden.sqlite; + passthru = { + tests = { + vaultwarden = nixosTests.vaultwarden.sqlite; + }; + updateScript = nix-update-script { + extraArgs = [ "--commit" "--version=stable" "--version-regex=^cli-v(.*)$" ]; + }; }; meta = with lib; { diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index e34bd5ea696f..104abfb85505 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -13,6 +13,7 @@ , makeDesktopItem , makeWrapper , napi-rs-cli +, nix-update-script , nodejs_20 , patchutils_0_4_2 , pkg-config @@ -28,13 +29,13 @@ let electron = electron_31; in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.8.1"; + version = "2024.8.2"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-FBNqgPjWSY8SCIGyKpoOl7I3pWQxDbWiFtcPZScDE4A="; + hash = "sha256-KATT4W2pP7VTcoHeshGx5VrBwlg3UqzKPcRY0Rzo7II="; }; patches = [ @@ -51,7 +52,7 @@ in buildNpmPackage rec { makeCacheWritable = true; npmFlags = [ "--engine-strict" "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-8cxhor90GqgO34AD8Jhd3N7PCnBnbhg8h7agVq0i3jk="; + npmDepsHash = "sha256-SnrK26QaxHYKX0532rGBASjx9PwxKSsVFRzZ3Cs2GPk="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -67,7 +68,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-zc5AarCbrJixcin8t+Ws8fH0ULM9rp3sUFsDb0htPuM="; + hash = "sha256-MjGKQky6LGtpG1maBWd+WkMZlnZfdl9Sm2dlvdD8ANw="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -195,6 +196,12 @@ in buildNpmPackage rec { }) ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--commit" "--version=stable" "--version-regex=^desktop-v(.*)$" ]; + }; + }; + meta = { changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; inherit description;