From e7177adafcda5722ce8a7b0bbff80269a1957b90 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 20 Aug 2020 14:24:38 +0900 Subject: [PATCH] cargo-update: 3.0.0 -> 4.1.1 --- ...te-lockfile-for-cargo-update-v4.1.1.patch} | 132 +++++++++--------- .../cargo-update/default.nix | 10 +- 2 files changed, 69 insertions(+), 73 deletions(-) rename pkgs/tools/package-management/cargo-update/{0001-Generate-lockfile-for-cargo-update-v3.0.0.patch => 0001-Generate-lockfile-for-cargo-update-v4.1.1.patch} (83%) diff --git a/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch similarity index 83% rename from pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch rename to pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch index 40cd310b643d..9aa7d8b1cc94 100644 --- a/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch +++ b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch @@ -1,26 +1,16 @@ -From 893ee8e76cc8b4096c84fe3a537e312304ce214b Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Wed, 11 Mar 2020 22:32:47 +0100 -Subject: [PATCH] Generate lockfile for cargo-update v3.0.0 - ---- - Cargo.lock | 632 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 632 insertions(+) - create mode 100644 Cargo.lock - diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 000000000..0b3a75632 +index 000000000..8d77f4824 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,632 @@ +@@ -0,0 +1,641 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "aho-corasick" -+version = "0.7.10" ++version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +dependencies = [ + "memchr", +] @@ -94,7 +84,7 @@ index 000000000..0b3a75632 + +[[package]] +name = "cargo-update" -+version = "3.0.0" ++version = "4.1.1" +dependencies = [ + "array_tool", + "clap", @@ -117,9 +107,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" +dependencies = [ + "jobserver", +] @@ -132,9 +122,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "clap" -+version = "2.33.0" ++version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", @@ -174,11 +164,10 @@ index 000000000..0b3a75632 + +[[package]] +name = "dirs-sys" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" ++checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" +dependencies = [ -+ "cfg-if", + "libc", + "redox_users", + "winapi", @@ -186,9 +175,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "embed-resource" -+version = "1.3.2" ++version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8398b939acbb266ade6939090e9f634147e7b426a33054a833d9ec935d814882" ++checksum = "1f6b0b4403da80c2fd32333937dd468292c001d778c587ae759b75432772715d" +dependencies = [ + "vswhom", + "winreg", @@ -222,9 +211,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "hermit-abi" -+version = "0.1.8" ++version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +dependencies = [ + "libc", +] @@ -275,9 +264,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "libc" -+version = "0.2.67" ++version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" ++checksum = "55821a41348652c211bf26f6453cb9397af531fc358a33752c864a4f5bccc20e" + +[[package]] +name = "libgit2-sys" @@ -295,9 +284,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "libssh2-sys" -+version = "0.2.16" ++version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7bb70f29dc7c31d32c97577f13f41221af981b31248083e347b7f2c39225a6bc" ++checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056" +dependencies = [ + "cc", + "libc", @@ -309,9 +298,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "libz-sys" -+version = "1.0.25" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" ++checksum = "af67924b8dd885cccea261866c8ce5b74d239d272e154053ff927dae839f5ae9" +dependencies = [ + "cc", + "libc", @@ -321,9 +310,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "log" -+version = "0.4.8" ++version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +dependencies = [ + "cfg-if", +] @@ -353,14 +342,24 @@ index 000000000..0b3a75632 +checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + +[[package]] -+name = "openssl-sys" -+version = "0.9.54" ++name = "openssl-src" ++version = "111.10.2+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" ++checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.58" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +dependencies = [ + "autocfg", + "cc", + "libc", ++ "openssl-src", + "pkg-config", + "vcpkg", +] @@ -373,33 +372,33 @@ index 000000000..0b3a75632 + +[[package]] +name = "pkg-config" -+version = "0.3.17" ++version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" ++checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" + +[[package]] +name = "proc-macro2" -+version = "1.0.9" ++version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" ++checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" -+version = "1.0.3" ++version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" -+version = "0.1.56" ++version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_users" @@ -414,9 +413,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "regex" -+version = "1.3.4" ++version = "1.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" ++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +dependencies = [ + "aho-corasick", + "memchr", @@ -426,9 +425,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "regex-syntax" -+version = "0.6.16" ++version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1" ++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" + +[[package]] +name = "rust-argon2" @@ -460,15 +459,15 @@ index 000000000..0b3a75632 + +[[package]] +name = "serde" -+version = "1.0.104" ++version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" + +[[package]] +name = "serde_derive" -+version = "1.0.104" ++version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" +dependencies = [ + "proc-macro2", + "quote", @@ -492,9 +491,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "syn" -+version = "1.0.16" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859" ++checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" +dependencies = [ + "proc-macro2", + "quote", @@ -557,15 +556,15 @@ index 000000000..0b3a75632 + +[[package]] +name = "unicode-width" -+version = "0.1.7" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" -+version = "0.2.0" ++version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "url" @@ -580,15 +579,15 @@ index 000000000..0b3a75632 + +[[package]] +name = "vcpkg" -+version = "0.2.8" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" + +[[package]] +name = "vec_map" -+version = "0.8.1" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "vswhom" @@ -618,9 +617,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "winapi" -+version = "0.3.8" ++version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", @@ -646,6 +645,3 @@ index 000000000..0b3a75632 +dependencies = [ + "winapi", +] --- -2.25.0 - diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index b9f586ccc6a0..d85a03fe49c7 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "3.0.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "nabijaczleweli"; repo = pname; rev = "v${version}"; - sha256 = "1jyfv8aa0gp67pvv8l2vkqq4j9rgjl4rq1wn4nqxb44gmvkg15l3"; + sha256 = "03yfn6jq33mykk2cicx54cpddilp62pb5ah75n96k1mwy7c46r6g"; }; - cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ]; - cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1"; + cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v4.1.1.patch ]; + cargoSha256 = "1yaawp015gdnlfqkdmqsf95gszz0h5j1vpfjh763y7kk0bp7zswl"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libgit2 libssh2 openssl zlib ] @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { description = "A cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; license = licenses.mit; - maintainers = with maintainers; [ gerschtli filalex77 ]; + maintainers = with maintainers; [ gerschtli filalex77 johntitor ]; }; }