lol

Merge pull request #115764 from marsam/update-rbw

rbw: 1.0.0 -> 1.1.2

authored by

Sandro and committed by
GitHub
89a7d1af aa202f1c

+26 -4
+19
pkgs/tools/security/rbw/bump-security-framework-crate.patch
··· 1 + Bump security-framework from 2.1.1 to 2.1.2 2 + 3 + security-framework=2.1.1 doesn't build on Darwin 10.12. 4 + https://github.com/kornelski/rust-security-framework/issues/124 5 + 6 + --- i/Cargo.lock 7 + +++ w/Cargo.lock 8 + @@ -1361,9 +1361,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" 9 + 10 + [[package]] 11 + name = "security-framework" 12 + -version = "2.1.1" 13 + +version = "2.1.2" 14 + source = "registry+https://github.com/rust-lang/crates.io-index" 15 + -checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166" 16 + +checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d" 17 + dependencies = [ 18 + "bitflags", 19 + "core-foundation",
+7 -4
pkgs/tools/security/rbw/default.nix
··· 7 7 , pkg-config 8 8 , makeWrapper 9 9 , Security 10 + , libiconv 10 11 11 12 # rbw-fzf 12 13 , withFzf ? false, fzf, perl ··· 20 21 21 22 rustPlatform.buildRustPackage rec { 22 23 pname = "rbw"; 23 - version = "1.0.0"; # do not upgrate 1.1.0 yet, because it doesn't build on Darwin 24 + version = "1.1.2"; 24 25 25 26 src = fetchCrate { 26 27 inherit version; 27 28 crateName = pname; 28 - sha256 = "0yqn65izcwbh7g085hwq4wrg9y9jlz1xbrq69b6ypqxi9abqnp6q"; 29 + sha256 = "1xihjx4f8kgyablxsy8vgn4w6i92p2xm5ncacdk39npa5g8wadlx"; 29 30 }; 30 31 31 - cargoSha256 = "0x00clixdbpqif2wzhj3f4k9kpza623xs8a05wq4g15227kz7mlm"; 32 + cargoSha256 = "0fvs06wd05a90dggi7n46d5gl9flnciqzg9j3ijmz3z5bb6aky1b"; 33 + 34 + cargoPatches = [ ./bump-security-framework-crate.patch ]; 32 35 33 36 nativeBuildInputs = [ 34 37 pkg-config 35 38 makeWrapper 36 39 ]; 37 40 38 - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; 41 + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; 39 42 40 43 postPatch = '' 41 44 substituteInPlace src/pinentry.rs \