Merge pull request #146217 from ivan/vaultwarden-rustc-1.56

authored by Sandro and committed by GitHub fd19aedb b12b76ea

+9 -1
+9 -1
pkgs/tools/security/vaultwarden/default.nix
··· 19 20 cargoSha256 = "sha256-ViXpoPkBznB0o/dc/l1r3m0y+z2w58wqlU8/cg8u7tI="; 21 22 nativeBuildInputs = [ pkg-config ]; 23 buildInputs = with lib; [ openssl ] 24 ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ] 25 ++ optional (dbBackend == "mysql") libmysqlclient 26 ++ optional (dbBackend == "postgresql") postgresql; 27 28 RUSTC_BOOTSTRAP = 1; 29 30 cargoBuildFlags = [ featuresFlag ]; ··· 42 description = "Unofficial Bitwarden compatible server written in Rust"; 43 homepage = "https://github.com/dani-garcia/vaultwarden"; 44 license = licenses.gpl3Only; 45 - maintainers = with maintainers; [ msteen ]; 46 }; 47 }
··· 19 20 cargoSha256 = "sha256-ViXpoPkBznB0o/dc/l1r3m0y+z2w58wqlU8/cg8u7tI="; 21 22 + postPatch = '' 23 + # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working 24 + # vaultwarden when using RUSTC_BOOTSTRAP=1 25 + sed -ri 's/^rust-version = .*//g' Cargo.toml 26 + ''; 27 + 28 nativeBuildInputs = [ pkg-config ]; 29 buildInputs = with lib; [ openssl ] 30 ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ] 31 ++ optional (dbBackend == "mysql") libmysqlclient 32 ++ optional (dbBackend == "postgresql") postgresql; 33 34 + # vaultwarden depends on rocket v0.5.0-dev, which requires nightly features. 35 + # This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed. 36 RUSTC_BOOTSTRAP = 1; 37 38 cargoBuildFlags = [ featuresFlag ]; ··· 50 description = "Unofficial Bitwarden compatible server written in Rust"; 51 homepage = "https://github.com/dani-garcia/vaultwarden"; 52 license = licenses.gpl3Only; 53 + maintainers = with maintainers; [ msteen ivan ]; 54 }; 55 }