Unverified Commit 78ed60de authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #248199 from figsoda/cotton 

cotton: unstable-2023-07-04 -> unstable-2023-08-09
parents 1e26ce7e 991accaa

pkgs/development/tools/cotton/Cargo.lock

+67 −49
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ dependencies = [ 


[[package]]

name = "async-compression"

version = "0.4.0"

version = "0.4.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11"

checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6"

dependencies = [

 "brotli",

 "flate2",
@@ -103,7 +103,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.23",

 "syn 2.0.28",

]



[[package]]
@@ -254,9 +254,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" 


[[package]]

name = "clap"

version = "4.3.10"

version = "4.3.21"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"

checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"

dependencies = [

 "clap_builder",

 "clap_derive",
@@ -265,9 +265,9 @@ dependencies = [ 


[[package]]

name = "clap_builder"

version = "4.3.10"

version = "4.3.21"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"

checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"

dependencies = [

 "anstream",

 "anstyle",
@@ -277,14 +277,14 @@ dependencies = [ 


[[package]]

name = "clap_derive"

version = "4.3.2"

version = "4.3.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"

checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"

dependencies = [

 "heck",

 "proc-macro2",

 "quote",

 "syn 2.0.23",

 "syn 2.0.28",

]



[[package]]
@@ -463,12 +463,12 @@ dependencies = [ 


[[package]]

name = "dashmap"

version = "5.4.0"

version = "5.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"

checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"

dependencies = [

 "cfg-if",

 "hashbrown 0.12.3",

 "hashbrown 0.14.0",

 "lock_api",

 "once_cell",

 "parking_lot_core",
@@ -568,7 +568,7 @@ checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" 
dependencies = [

 "cfg-if",

 "libc",

 "redox_syscall",

 "redox_syscall 0.2.13",

 "windows-sys 0.36.1",

]
@@ -690,7 +690,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.23",

 "syn 2.0.28",

]



[[package]]
@@ -862,7 +862,7 @@ dependencies = [ 
 "httpdate",

 "itoa",

 "pin-project-lite",

 "socket2",

 "socket2 0.4.9",

 "tokio",

 "tower-service",

 "tracing",
@@ -938,9 +938,9 @@ dependencies = [ 


[[package]]

name = "indicatif"

version = "0.17.5"

version = "0.17.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"

checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"

dependencies = [

 "console",

 "instant",
@@ -994,7 +994,7 @@ version = "0.3.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"

dependencies = [

 "socket2",

 "socket2 0.4.9",

 "widestring",

 "winapi",

 "winreg 0.7.0",
@@ -1098,9 +1098,9 @@ checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" 


[[package]]

name = "lock_api"

version = "0.4.8"

version = "0.4.10"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"

checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"

dependencies = [

 "autocfg",

 "scopeguard",
@@ -1367,15 +1367,15 @@ dependencies = [ 


[[package]]

name = "parking_lot_core"

version = "0.9.3"

version = "0.9.8"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"

checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"

dependencies = [

 "cfg-if",

 "libc",

 "redox_syscall",

 "redox_syscall 0.3.5",

 "smallvec",

 "windows-sys 0.36.1",

 "windows-targets 0.48.0",

]



[[package]]
@@ -1406,9 +1406,9 @@ dependencies = [ 


[[package]]

name = "pin-project-lite"

version = "0.2.9"

version = "0.2.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"

checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c"



[[package]]

name = "pin-utils"
@@ -1491,6 +1491,15 @@ dependencies = [ 
 "bitflags",

]



[[package]]

name = "redox_syscall"

version = "0.3.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"

dependencies = [

 "bitflags",

]



[[package]]

name = "regex"

version = "1.6.0"
@@ -1679,29 +1688,29 @@ dependencies = [ 


[[package]]

name = "serde"

version = "1.0.166"

version = "1.0.183"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"

checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"

dependencies = [

 "serde_derive",

]



[[package]]

name = "serde_derive"

version = "1.0.166"

version = "1.0.183"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"

checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.23",

 "syn 2.0.28",

]



[[package]]

name = "serde_json"

version = "1.0.99"

version = "1.0.104"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"

checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"

dependencies = [

 "indexmap 2.0.0",

 "itoa",
@@ -1711,9 +1720,9 @@ dependencies = [ 


[[package]]

name = "serde_path_to_error"

version = "0.1.12"

version = "0.1.14"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0b1b6471d7496b051e03f1958802a73f88b947866f5146f329e47e36554f4e55"

checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"

dependencies = [

 "itoa",

 "serde",
@@ -1783,6 +1792,16 @@ dependencies = [ 
 "winapi",

]



[[package]]

name = "socket2"

version = "0.5.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"

dependencies = [

 "libc",

 "windows-sys 0.48.0",

]



[[package]]

name = "spin"

version = "0.5.2"
@@ -1823,9 +1842,9 @@ dependencies = [ 


[[package]]

name = "syn"

version = "2.0.23"

version = "2.0.28"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"

checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"

dependencies = [

 "proc-macro2",

 "quote",
@@ -1894,11 +1913,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" 


[[package]]

name = "tokio"

version = "1.29.1"

version = "1.30.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"

checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd"

dependencies = [

 "autocfg",

 "backtrace",

 "bytes",

 "libc",
@@ -1907,7 +1925,7 @@ dependencies = [ 
 "parking_lot",

 "pin-project-lite",

 "signal-hook-registry",

 "socket2",

 "socket2 0.5.3",

 "tokio-macros",

 "windows-sys 0.48.0",

]
@@ -1920,7 +1938,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.23",

 "syn 2.0.28",

]



[[package]]
@@ -1952,7 +1970,7 @@ dependencies = [ 
 "filetime",

 "futures-core",

 "libc",

 "redox_syscall",

 "redox_syscall 0.2.13",

 "tokio",

 "tokio-stream",

 "xattr",
@@ -1975,9 +1993,9 @@ dependencies = [ 


[[package]]

name = "toml"

version = "0.7.5"

version = "0.7.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"

checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"

dependencies = [

 "serde",

 "serde_spanned",
@@ -1996,9 +2014,9 @@ dependencies = [ 


[[package]]

name = "toml_edit"

version = "0.19.11"

version = "0.19.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"

checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"

dependencies = [

 "indexmap 2.0.0",

 "serde",
@@ -2032,7 +2050,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" 
dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.23",

 "syn 2.0.28",

]



[[package]]

pkgs/development/tools/cotton/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


rustPlatform.buildRustPackage rec {

  pname = "cotton";

  version = "unstable-2023-07-04";

  version = "unstable-2023-08-09";



  src = fetchFromGitHub {

    owner = "danielhuang";

    repo = pname;

    rev = "940564f64fb6cc6a4bf1e59bc2498ca19a62e1c3";

    sha256 = "sha256-SwbF+CRjcjCDMt4tCq8dWbTsnIP5tZZw4e2cThQJIdY=";

    rev = "04e2dfd123f7af6e78e3ce86b2fc04ca4c754cdc";

    sha256 = "sha256-+HOuQyGkyS7oG0I0DkFGl+6YIDpV4GCCgC+a5Jwo4fw=";

  };



  cargoLock = {