Unverified Commit 2e11a226 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #334048 from r-ryantm/auto-update/vaultwarden 

vaultwarden: 1.31.0 -> 1.32.0
parents fc35704b ae16dda2

pkgs/tools/security/vaultwarden/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ in 


rustPlatform.buildRustPackage rec {

  pname = "vaultwarden";

  version = "1.31.0";

  version = "1.32.0";



  src = fetchFromGitHub {

    owner = "dani-garcia";

    repo = "vaultwarden";

    rev = version;

    hash = "sha256-fQjTSLPJQk1byjX+HADtQvQRqEaEiCmWjgA1WIMLBu4=";

    hash = "sha256-y8+hkvUKj0leJJ5w72HOVDSOtKW6y2Y44VfOZSetn4M=";

  };



  cargoHash = "sha256-VWKkZvuv+B9V6pgxZRGlLIRUdLEh61RpOfEnOtEBKU0=";

  cargoHash = "sha256-1Z0ba1FhxQ5qVpofi0XD1MYz02QCvdXGeuViW3lU6JQ=";



  # used for "Server Installed" version in admin panel

  env.VW_VERSION = version;

pkgs/tools/security/vaultwarden/webvault.nix

+4 −4
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 
}:



let

  version = "2024.5.1b";

  version = "2024.6.2b";



  bw_web_builds = fetchFromGitHub {

    owner = "dani-garcia";

    repo = "bw_web_builds";

    rev = "v${version}";

    hash = "sha256-5nlFt05ari9ovl+CaoyR/X9BzhsmsGyDt6eGLJ5ae/4=";

    hash = "sha256-Gcn/TOXdhMqGq4NTCPQTTEvN5rOQS3LImPUYBsv8de8=";

  };



in buildNpmPackage rec {
@@ -25,10 +25,10 @@ in buildNpmPackage rec { 
    owner = "bitwarden";

    repo = "clients";

    rev = "web-v${lib.removeSuffix "b" version}";

    hash = "sha256-U/lAt2HfoHGMu6mOki/4+ljhU9FwkodvFBr5zcDO8Wk=";

    hash = "sha256-HMQ0oQ04WkLlUgsYt6ZpcziDq05mnSA0+VnJCpteceg=";

  };



  npmDepsHash = "sha256-ui00afmnu77CTT9gh6asc4uT7AhVIuiD60sq/1f9viA=";

  npmDepsHash = "sha256-zMzQEM5mV14gewzYhy1F2bNEugXjZSOviYwYVV2Cb8c=";



  postPatch = ''

    ln -s ${bw_web_builds}/{patches,resources} ..