Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-11-04 09:28:07 +01:00
172 changed files with 7114 additions and 4476 deletions
+3 -3
View File
@@ -8,13 +8,13 @@ let
in rustPlatform.buildRustPackage rec {
pname = "bitwarden_rs";
version = "1.16.3";
version = "1.17.0";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = pname;
rev = version;
sha256 = "1scy8abzy6j1jsms84cg2nqkn1zsxr5mjikp2xh0yl0ckkk13ffn";
sha256 = "0hi29vy23a5r23pgzdssd2gvim8vw2vmykck5cl5phq11a3az31p";
};
nativeBuildInputs = [ pkgconfig ];
@@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1;
cargoSha256 = "112mvgq581cms0war5dbni7f7yryjr5agryzn5qx835qkznzar8s";
cargoSha256 = "0hv3k5l85nz4syzamranhi237fiwkjnda8v5ssnm2nsmcm7ih9k8";
cargoBuildFlags = [ featuresFlag ];
checkPhase = ''
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault";
version = "2.16.0b";
version = "2.16.1";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
sha256 = "1p10a5rp2ymx675sbigwrkkfjvpk1lz3d43l2p2i1vbw153py3p1";
sha256 = "1c4fcf8jzgd6636wv903r5msc9z5l56l2i4k93kvb2zvg7qj014w";
};
buildCommand = ''