From 242350554c1d45a7d50662a1d083d74ca301b720 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 30 Jul 2019 14:37:37 -0700 Subject: [PATCH 1/2] bitwarden_rs-vault: 2.10.1 -> 2.11.0 --- pkgs/tools/security/bitwarden_rs/vault.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 44c8047684f..76b9f24224c 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.10.1"; + version = "2.11.0"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1avgxlsxi7mb8zpqai3j1qb43qq09ya5ngb7l4q7mj0d89lxrzhb"; + sha256 = "06f0rcpqhz5qjm01jbxx2czhnj9ng29rgsrilm5r5xx31s9dnhg7"; }; buildCommand = '' From fef48df3a15a3af7896cdc8569e2035061e4b886 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 30 Jul 2019 14:37:55 -0700 Subject: [PATCH 2/2] bitwarden_rs: 1.9.0 -> 1.9.1 --- .../bitwarden_rs/cargo-lock-lettre.patch | 58 +++++++++++++++++++ pkgs/tools/security/bitwarden_rs/default.nix | 11 +++- 2 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/security/bitwarden_rs/cargo-lock-lettre.patch diff --git a/pkgs/tools/security/bitwarden_rs/cargo-lock-lettre.patch b/pkgs/tools/security/bitwarden_rs/cargo-lock-lettre.patch new file mode 100644 index 00000000000..d9f491ca290 --- /dev/null +++ b/pkgs/tools/security/bitwarden_rs/cargo-lock-lettre.patch @@ -0,0 +1,58 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 2e0b695..6d23410 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -114,8 +114,8 @@ dependencies = [ + "handlebars 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonwebtoken 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lettre 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "lettre_email 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "multipart 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1007,13 +1007,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "lettre" +-version = "0.9.1" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fast_chemail 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)", + "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1026,14 +1024,12 @@ dependencies = [ + + [[package]] + name = "lettre_email" +-version = "0.9.1" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "email 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "lettre 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -2858,8 +2854,8 @@ dependencies = [ + "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" + "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" + "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" +-"checksum lettre 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "646aee0a55545eaffdf0df1ac19b500b51adb3095ec4dfdc704134e56ea23531" +-"checksum lettre_email 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae1b3d43e4bb7beb9974a359cbb3ea4f93dfba6c1c0c6e9c9f82e538e0f9ab9f" ++"checksum lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c66afaa5dfadbb81d4e00fd1d1ab057c7cd4c799c5a44e0009386d553587e728" ++"checksum lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bbb68ca999042d965476e47bbdbacd52db0927348b6f8062c44dd04a3b1fd43b" + "checksum libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "42914d39aad277d9e176efbdad68acb1d5443ab65afe0e0e4f0d49352a950880" + "checksum libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6457c70bbff456d9fe49deaba35ec47c3e598bf8d7950ff0575ceb7a8a6ad1" + "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index d22a2773fd9..f04996f1b43 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -2,21 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "14c2blzkmdd9s0gpf6b7y141yx9s2v2gmwy5l1lgqjhi3h6jpcqr"; + sha256 = "0jfb4b2lp2v01aw615lx0qj1qh73hyrbjn9kva7zqp74wcfw12gp"; }; + cargoPatches = [ + # type annotations required: cannot resolve `std::string::String: std::convert::AsRef<_>` + ./cargo-lock-lettre.patch + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ]; RUSTC_BOOTSTRAP = 1; - cargoSha256 = "038l6alcdc0g4avpbzxgd2k09nr3wrsbry763bq2c77qqgwldj8r"; + cargoSha256 = "0p39gqrqdmgqhngp1qyh6jl0sp0ifj5n3bxfqafjbspb4zph3ls4"; meta = with stdenv.lib; { description = "An unofficial lightweight implementation of the Bitwarden server API using Rust and SQLite";