vaultwarden: 1.35.8 -> 1.36.0 (#516109)
This commit is contained in:
@@ -8,9 +8,10 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
libiconv,
|
||||
dbBackend ? "sqlite",
|
||||
dbBackend ? "sqlite_system",
|
||||
libmysqlclient,
|
||||
libpq,
|
||||
sqlite,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -19,16 +20,16 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vaultwarden";
|
||||
version = "1.35.8";
|
||||
version = "1.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "vaultwarden";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bEPwH0+b4cQTh1hNiiX2qvTNeRxxShm2JXNKNfn4xm8=";
|
||||
hash = "sha256-jc2f7Ia2c+U1cQBXmyzfQAgFMFoAPexLejs6/FKaN9I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gcE3qfSVCk08haADyqOff4R0ekd9Q6RB59LUtow9Yi4=";
|
||||
cargoHash = "sha256-sjWBM9SsI/7AQ8SuFiTR19l8kqp3rhy64Uh/1TatH6A=";
|
||||
|
||||
# used for "Server Installed" version in admin panel
|
||||
env.VW_VERSION = finalAttrs.version;
|
||||
@@ -41,7 +42,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
libiconv
|
||||
]
|
||||
++ lib.optional (dbBackend == "mysql") libmysqlclient
|
||||
++ lib.optional (dbBackend == "postgresql") libpq;
|
||||
++ lib.optional (dbBackend == "postgresql") libpq
|
||||
++ lib.optional (dbBackend == "sqlite_system") sqlite;
|
||||
|
||||
buildFeatures = dbBackend;
|
||||
|
||||
|
||||
@@ -10,16 +10,25 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vaultwarden-webvault";
|
||||
version = "2026.3.1+0";
|
||||
version = "2026.4.1+0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vaultwarden";
|
||||
repo = "vw_web_builds";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nUhSoqf655eOs+rKqAZB0XzPD6ePL6CIxVAnB5dmJAs=";
|
||||
hash = "sha256-CIKhdCQwx1zS8rkOtZoG9WDxtweSmrCNL6HfZXi+mM8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-dlYN2aiv6XbDXQVstfI6XIe+X5Q1lqs62eNalGTGx7k=";
|
||||
# Upstream lockfile is out of sync for @napi-rs/cli (spec 3.5.1, resolved
|
||||
# 3.2.0), which makes offline `npm ci` hit the registry. The desktop
|
||||
# workspace is unused here. https://github.com/bitwarden/clients/pull/20480
|
||||
postPatch = ''
|
||||
substituteInPlace package-lock.json \
|
||||
--replace-fail '"@napi-rs/cli": "3.5.1"' '"@napi-rs/cli": "3.2.0"'
|
||||
'';
|
||||
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDepsHash = "sha256-NBhII5HySIkv0bCeWjH6MknX5NMp11Gwno7RnfCKgjc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
||||
Reference in New Issue
Block a user