Unverified Commit 0a9df042 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #207595 from wahjava/update-vaultwarden 

vaultwarden: 1.26.0 -> 1.27.0
parents 9f87711f eb4891d2

nixos/tests/vaultwarden.nix

+8 −6
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ let 


                  wait = WebDriverWait(driver, 10)



                  wait.until(EC.title_contains("Create Account"))

                  wait.until(EC.title_contains("Create account"))



                  driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_email').send_keys(

                      '${userEmail}'
@@ -122,18 +122,20 @@ let 
                      '${userPassword}'

                  )



                  driver.find_element(By.XPATH, "//button[contains(., 'Create Account')]").click()

                  driver.find_element(By.XPATH, "//button[contains(., 'Create account')]").click()



                  wait.until_not(EC.title_contains("Create Account"))

                  wait.until_not(EC.title_contains("Create account"))



                  driver.find_element(By.XPATH, "//button[contains(., 'Continue')]").click()



                  driver.find_element(By.CSS_SELECTOR, 'input#login_input_master-password').send_keys(

                      '${userPassword}'

                  )

                  driver.find_element(By.XPATH, "//button[contains(., 'Log In')]").click()

                  driver.find_element(By.XPATH, "//button[contains(., 'Log in')]").click()



                  wait.until(EC.title_contains("Bitwarden Web Vault"))

                  wait.until(EC.title_contains("Vaultwarden Web Vault"))



                  driver.find_element(By.XPATH, "//button[contains(., 'Add Item')]").click()

                  driver.find_element(By.XPATH, "//button[contains(., 'Add item')]").click()



                  driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys(

                      'secrets'

pkgs/tools/security/vaultwarden/default.nix

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


rustPlatform.buildRustPackage rec {

  pname = "vaultwarden";

  version = "1.26.0";

  version = "1.27.0";



  src = fetchFromGitHub {

    owner = "dani-garcia";

    repo = pname;

    rev = version;

    sha256 = "sha256-LPIc1odUBvjVJty3GYYFNhile4XBWMisLUeVtWH6xgE=";

    hash = "sha256-QvU1Y3syr6PZbTRebbZF4sEzI4lIj1enJe2F/gGfvQM=";

  };



  cargoSha256 = "sha256-IfseODaoqlPNBlVjS+9+rKXAOq29TgULMA/ogmqg0NA=";



  postPatch = ''

    # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working

    # vaultwarden when using RUSTC_BOOTSTRAP=1

    sed -ri 's/^rust-version = .*//g' Cargo.toml

  '';

  cargoHash = "sha256-lylRGg5pzJ4sBS3bY4ObMoJ5s5kakMLTtq1VOnmS5HM";



  nativeBuildInputs = [ pkg-config ];

  buildInputs = with lib; [ openssl ]

pkgs/tools/security/vaultwarden/webvault.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


stdenv.mkDerivation rec {

  pname = "vaultwarden-webvault";

  version = "2022.10.0";

  version = "2022.12.0";



  src = fetchurl {

    url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";

    hash = "sha256-Sf1YnOikjZmloTQvdrFH/UAevQqKQEkNNrCRUhvNZfA=";

    hash = "sha256-QC3/aqIF2NdJPHmwUbvJR62wsUGBrgsHJCyqBJ/0gMc=";

  };



  buildCommand = ''