diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index a20ce16cec5c..c4d881373fa2 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -3,18 +3,20 @@ , fetchFromGitHub , git , nixosTests -, python311 +, python3 , vaultwarden }: let - version = "2024.6.2b"; + version = "2024.6.2c"; + + suffix = lib.head (lib.match "[0-9.]*([a-z]*)" version); bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-Gcn/TOXdhMqGq4NTCPQTTEvN5rOQS3LImPUYBsv8de8="; + hash = "sha256-Gd8yQx9j6ieUvaM6IPSELNRy83y0cBkBwLYMqk8OIjU="; }; in buildNpmPackage rec { @@ -24,7 +26,7 @@ in buildNpmPackage rec { src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; - rev = "web-v${lib.removeSuffix "b" version}"; + rev = "web-v${lib.removeSuffix suffix version}"; hash = "sha256-HMQ0oQ04WkLlUgsYt6ZpcziDq05mnSA0+VnJCpteceg="; }; @@ -37,8 +39,7 @@ in buildNpmPackage rec { ''; nativeBuildInputs = [ - # signalr through gyp wants to import distutils - python311 + (python3.withPackages (ps: [ ps.setuptools ])) ]; makeCacheWritable = true;