diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/security/vaultwarden/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/security/vaultwarden/default.nix | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index eb4de54c303e..13399698c0ed 100644 --- a/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/vaultwarden/default.nix @@ -3,21 +3,24 @@ , libiconv, Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: -let - featuresFlag = "--features ${dbBackend}"; - -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.22.2"; + version = "1.23.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "sha256-37+Gor3xyo0yb3I4rrleJoPnqTA7G3WmeMSTltthi2E="; + sha256 = "sha256-UMeltpuGUPdB5j4NBxA6SuLUqzinrF8USCaJk9SjDJA="; }; - cargoSha256 = "sha256-+zu5OfvXj8DMglf5Xv5ZcaUlbE03cwyD8TN7YftgWO0="; + cargoSha256 = "sha256-8SjCWioOK/bk6G+0Yfl0ilgbLu83hn+AtuX9QWrnQEc="; + + 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 + ''; nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] @@ -25,16 +28,11 @@ in rustPlatform.buildRustPackage rec { ++ optional (dbBackend == "mysql") libmysqlclient ++ optional (dbBackend == "postgresql") postgresql; + # vaultwarden depends on rocket v0.5.0-dev, which requires nightly features. + # This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed. RUSTC_BOOTSTRAP = 1; - cargoBuildFlags = [ featuresFlag ]; - - checkPhase = '' - runHook preCheck - echo "Running cargo cargo test ${featuresFlag} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test ${featuresFlag} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} - runHook postCheck - ''; + buildFeatures = dbBackend; passthru.tests = nixosTests.vaultwarden; @@ -42,6 +40,6 @@ in rustPlatform.buildRustPackage rec { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/vaultwarden"; license = licenses.gpl3Only; - maintainers = with maintainers; [ msteen ]; + maintainers = with maintainers; [ msteen ivan ]; }; } |