prefetch-npm-deps: use isahc instead of ureq (d2897e46) · Commits · nix / nixpkgs

pkgs/build-support/node/fetch-npm-deps/Cargo.lock

+380 −199

Original line number	Diff line number	Diff line
		@@ -2,18 +2,23 @@
		# It is not intended for manual editing.
		version = 3

		[[package]]
		name = "adler"
		version = "1.0.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

		[[package]]
		name = "anyhow"
		version = "1.0.71"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"

		[[package]]
		name = "async-channel"
		version = "1.8.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
		dependencies = [
		"concurrent-queue",
		"event-listener",
		"futures-core",
		]

		[[package]]
		name = "autocfg"
		version = "1.1.0"
		@@ -42,10 +47,16 @@ dependencies = [
		]

		[[package]]
		name = "bumpalo"
		version = "3.13.0"
		name = "bytes"
		version = "1.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
		checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"

		[[package]]
		name = "castaway"
		version = "0.1.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"

		[[package]]
		name = "cc"
		@@ -60,21 +71,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

		[[package]]
		name = "cpufeatures"
		version = "0.2.8"
		name = "concurrent-queue"
		version = "2.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
		checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
		dependencies = [
		"libc",
		"crossbeam-utils",
		]

		[[package]]
		name = "crc32fast"
		version = "1.3.2"
		name = "cpufeatures"
		version = "0.2.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
		checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
		dependencies = [
		"cfg-if",
		"libc",
		]

		[[package]]
		@@ -130,6 +141,36 @@ dependencies = [
		"typenum",
		]

		[[package]]
		name = "curl"
		version = "0.4.44"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
		dependencies = [
		"curl-sys",
		"libc",
		"openssl-probe",
		"openssl-sys",
		"schannel",
		"socket2",
		"winapi",
		]

		[[package]]
		name = "curl-sys"
		version = "0.4.63+curl-8.1.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "aeb0fef7046022a1e2ad67a004978f0e3cacb9e3123dc62ce768f92197b771dc"
		dependencies = [
		"cc",
		"libc",
		"libz-sys",
		"openssl-sys",
		"pkg-config",
		"vcpkg",
		"winapi",
		]

		[[package]]
		name = "digest"
		version = "0.10.7"
		@@ -154,7 +195,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
		dependencies = [
		"errno-dragonfly",
		"libc",
		"windows-sys",
		"windows-sys 0.48.0",
		]

		[[package]]
		@@ -167,6 +208,12 @@ dependencies = [
		"libc",
		]

		[[package]]
		name = "event-listener"
		version = "2.5.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"

		[[package]]
		name = "fastrand"
		version = "1.9.0"
		@@ -177,14 +224,10 @@ dependencies = [
		]

		[[package]]
		name = "flate2"
		version = "1.0.26"
		name = "fnv"
		version = "1.0.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
		dependencies = [
		"crc32fast",
		"miniz_oxide",
		]
		checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

		[[package]]
		name = "form_urlencoded"
		@@ -195,6 +238,33 @@ dependencies = [
		"percent-encoding",
		]

		[[package]]
		name = "futures-core"
		version = "0.3.28"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"

		[[package]]
		name = "futures-io"
		version = "0.3.28"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"

		[[package]]
		name = "futures-lite"
		version = "1.13.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
		dependencies = [
		"fastrand",
		"futures-core",
		"futures-io",
		"memchr",
		"parking",
		"pin-project-lite",
		"waker-fn",
		]

		[[package]]
		name = "generic-array"
		version = "0.14.7"
		@@ -211,6 +281,17 @@ version = "0.3.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"

		[[package]]
		name = "http"
		version = "0.2.9"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
		dependencies = [
		"bytes",
		"fnv",
		"itoa",
		]

		[[package]]
		name = "idna"
		version = "0.4.0"
		@@ -238,23 +319,39 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
		dependencies = [
		"hermit-abi",
		"libc",
		"windows-sys",
		"windows-sys 0.48.0",
		]

		[[package]]
		name = "itoa"
		version = "1.0.6"
		name = "isahc"
		version = "1.7.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
		checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
		dependencies = [
		"async-channel",
		"castaway",
		"crossbeam-utils",
		"curl",
		"curl-sys",
		"event-listener",
		"futures-lite",
		"http",
		"log",
		"once_cell",
		"polling",
		"slab",
		"sluice",
		"tracing",
		"tracing-futures",
		"url",
		"waker-fn",
		]

		[[package]]
		name = "js-sys"
		version = "0.3.64"
		name = "itoa"
		version = "1.0.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
		dependencies = [
		"wasm-bindgen",
		]
		checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"

		[[package]]
		name = "libc"
		@@ -262,6 +359,18 @@ version = "0.2.147"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"

		[[package]]
		name = "libz-sys"
		version = "1.1.9"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db"
		dependencies = [
		"cc",
		"libc",
		"pkg-config",
		"vcpkg",
		]

		[[package]]
		name = "linux-raw-sys"
		version = "0.3.8"
		@@ -274,6 +383,12 @@ version = "0.4.19"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"

		[[package]]
		name = "memchr"
		version = "2.5.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

		[[package]]
		name = "memoffset"
		version = "0.9.0"
		@@ -283,15 +398,6 @@ dependencies = [
		"autocfg",
		]

		[[package]]
		name = "miniz_oxide"
		version = "0.7.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
		dependencies = [
		"adler",
		]

		[[package]]
		name = "num_cpus"
		version = "1.16.0"
		@@ -308,12 +414,84 @@ version = "1.18.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

		[[package]]
		name = "openssl-probe"
		version = "0.1.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

		[[package]]
		name = "openssl-sys"
		version = "0.9.90"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
		dependencies = [
		"cc",
		"libc",
		"pkg-config",
		"vcpkg",
		]

		[[package]]
		name = "parking"
		version = "2.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"

		[[package]]
		name = "percent-encoding"
		version = "2.3.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"

		[[package]]
		name = "pin-project"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
		dependencies = [
		"pin-project-internal",
		]

		[[package]]
		name = "pin-project-internal"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
		dependencies = [
		"proc-macro2",
		"quote",
		"syn",
		]

		[[package]]
		name = "pin-project-lite"
		version = "0.2.9"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"

		[[package]]
		name = "pkg-config"
		version = "0.3.27"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"

		[[package]]
		name = "polling"
		version = "2.8.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
		dependencies = [
		"autocfg",
		"bitflags",
		"cfg-if",
		"concurrent-queue",
		"libc",
		"log",
		"pin-project-lite",
		"windows-sys 0.48.0",
		]

		[[package]]
		name = "prefetch-npm-deps"
		version = "0.1.0"
		@@ -321,13 +499,13 @@ dependencies = [
		"anyhow",
		"base64",
		"digest",
		"isahc",
		"rayon",
		"serde",
		"serde_json",
		"sha1",
		"sha2",
		"tempfile",
		"ureq",
		"url",
		"walkdir",
		]
		@@ -381,21 +559,6 @@ dependencies = [
		"bitflags",
		]

		[[package]]
		name = "ring"
		version = "0.16.20"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
		dependencies = [
		"cc",
		"libc",
		"once_cell",
		"spin",
		"untrusted",
		"web-sys",
		"winapi",
		]

		[[package]]
		name = "rustix"
		version = "0.37.20"
		@@ -407,29 +570,7 @@ dependencies = [
		"io-lifetimes",
		"libc",
		"linux-raw-sys",
		"windows-sys",
		]

		[[package]]
		name = "rustls"
		version = "0.21.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f"
		dependencies = [
		"log",
		"ring",
		"rustls-webpki",
		"sct",
		]

		[[package]]
		name = "rustls-webpki"
		version = "0.100.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
		dependencies = [
		"ring",
		"untrusted",
		"windows-sys 0.48.0",
		]

		[[package]]
		@@ -448,20 +589,19 @@ dependencies = [
		]

		[[package]]
		name = "scopeguard"
		version = "1.1.0"
		name = "schannel"
		version = "0.1.21"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
		checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
		dependencies = [
		"windows-sys 0.42.0",
		]

		[[package]]
		name = "sct"
		version = "0.7.0"
		name = "scopeguard"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
		dependencies = [
		"ring",
		"untrusted",
		]
		checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

		[[package]]
		name = "serde"
		@@ -517,10 +657,34 @@ dependencies = [
		]

		[[package]]
		name = "spin"
		version = "0.5.2"
		name = "slab"
		version = "0.4.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
		dependencies = [
		"autocfg",
		]

		[[package]]
		name = "sluice"
		version = "0.5.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
		dependencies = [
		"async-channel",
		"futures-core",
		"futures-io",
		]

		[[package]]
		name = "socket2"
		version = "0.4.9"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
		checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
		dependencies = [
		"libc",
		"winapi",
		]

		[[package]]
		name = "syn"
		@@ -544,7 +708,7 @@ dependencies = [
		"fastrand",
		"redox_syscall",
		"rustix",
		"windows-sys",
		"windows-sys 0.48.0",
		]

		[[package]]
		@@ -562,6 +726,49 @@ version = "0.1.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

		[[package]]
		name = "tracing"
		version = "0.1.37"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
		dependencies = [
		"cfg-if",
		"log",
		"pin-project-lite",
		"tracing-attributes",
		"tracing-core",
		]

		[[package]]
		name = "tracing-attributes"
		version = "0.1.26"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
		dependencies = [
		"proc-macro2",
		"quote",
		"syn",
		]

		[[package]]
		name = "tracing-core"
		version = "0.1.31"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
		dependencies = [
		"once_cell",
		]

		[[package]]
		name = "tracing-futures"
		version = "0.2.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
		dependencies = [
		"pin-project",
		"tracing",
		]

		[[package]]
		name = "typenum"
		version = "1.16.0"
		@@ -589,28 +796,6 @@ dependencies = [
		"tinyvec",
		]

		[[package]]
		name = "untrusted"
		version = "0.7.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"

		[[package]]
		name = "ureq"
		version = "2.7.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9"
		dependencies = [
		"base64",
		"flate2",
		"log",
		"once_cell",
		"rustls",
		"rustls-webpki",
		"url",
		"webpki-roots",
		]

		[[package]]
		name = "url"
		version = "2.4.0"
		@@ -623,12 +808,24 @@ dependencies = [
		"serde",
		]

		[[package]]
		name = "vcpkg"
		version = "0.2.15"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

		[[package]]
		name = "version_check"
		version = "0.9.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

		[[package]]
		name = "waker-fn"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"

		[[package]]
		name = "walkdir"
		version = "2.3.3"
		@@ -639,79 +836,6 @@ dependencies = [
		"winapi-util",
		]

		[[package]]
		name = "wasm-bindgen"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
		dependencies = [
		"cfg-if",
		"wasm-bindgen-macro",
		]

		[[package]]
		name = "wasm-bindgen-backend"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
		dependencies = [
		"bumpalo",
		"log",
		"once_cell",
		"proc-macro2",
		"quote",
		"syn",
		"wasm-bindgen-shared",
		]

		[[package]]
		name = "wasm-bindgen-macro"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
		dependencies = [
		"quote",
		"wasm-bindgen-macro-support",
		]

		[[package]]
		name = "wasm-bindgen-macro-support"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
		dependencies = [
		"proc-macro2",
		"quote",
		"syn",
		"wasm-bindgen-backend",
		"wasm-bindgen-shared",
		]

		[[package]]
		name = "wasm-bindgen-shared"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"

		[[package]]
		name = "web-sys"
		version = "0.3.64"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
		dependencies = [
		"js-sys",
		"wasm-bindgen",
		]

		[[package]]
		name = "webpki-roots"
		version = "0.23.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
		dependencies = [
		"rustls-webpki",
		]

		[[package]]
		name = "winapi"
		version = "0.3.9"
		@@ -743,6 +867,21 @@ version = "0.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

		[[package]]
		name = "windows-sys"
		version = "0.42.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
		dependencies = [
		"windows_aarch64_gnullvm 0.42.2",
		"windows_aarch64_msvc 0.42.2",
		"windows_i686_gnu 0.42.2",
		"windows_i686_msvc 0.42.2",
		"windows_x86_64_gnu 0.42.2",
		"windows_x86_64_gnullvm 0.42.2",
		"windows_x86_64_msvc 0.42.2",
		]

		[[package]]
		name = "windows-sys"
		version = "0.48.0"
		@@ -758,51 +897,93 @@ version = "0.48.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
		dependencies = [
		"windows_aarch64_gnullvm",
		"windows_aarch64_msvc",
		"windows_i686_gnu",
		"windows_i686_msvc",
		"windows_x86_64_gnu",
		"windows_x86_64_gnullvm",
		"windows_x86_64_msvc",
		"windows_aarch64_gnullvm 0.48.0",
		"windows_aarch64_msvc 0.48.0",
		"windows_i686_gnu 0.48.0",
		"windows_i686_msvc 0.48.0",
		"windows_x86_64_gnu 0.48.0",
		"windows_x86_64_gnullvm 0.48.0",
		"windows_x86_64_msvc 0.48.0",
		]

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.48.0"

pkgs/build-support/node/fetch-npm-deps/Cargo.toml

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,12 +9,12 @@ edition = "2021"
		anyhow = "1.0.71"
		base64 = "0.21.2"
		digest = "0.10.7"
		isahc = { version = "1.7.2", default_features = false }
		rayon = "1.7.0"
		serde = { version = "1.0.164", features = ["derive"] }
		serde_json = "1.0.99"
		sha1 = "0.10.5"
		sha2 = "0.10.7"
		tempfile = "3.6.0"
		ureq = { version = "2.5.0" }
		url = { version = "2.4.0", features = ["serde"] }
		walkdir = "2.3.3"

pkgs/build-support/node/fetch-npm-deps/default.nix

+9 −3

Original line number	Diff line number	Diff line
		{ lib, stdenvNoCC, rustPlatform, makeWrapper, Security, gnutar, gzip, nix, testers, fetchurl, prefetch-npm-deps, fetchNpmDeps }:
		{ lib, stdenvNoCC, rustPlatform, makeWrapper, pkg-config, curl, gnutar, gzip, nix, testers, fetchurl, cacert, prefetch-npm-deps, fetchNpmDeps }:

		{
		prefetch-npm-deps = rustPlatform.buildRustPackage {
		@@ -16,8 +16,8 @@

		cargoLock.lockFile = ./Cargo.lock;

		nativeBuildInputs = [ makeWrapper ];
		buildInputs = lib.optional stdenvNoCC.isDarwin Security;
		nativeBuildInputs = [ makeWrapper pkg-config ];
		buildInputs = [ curl ];

		postInstall = ''
		wrapProgram "$out/bin/prefetch-npm-deps" --prefix PATH : ${lib.makeBinPath [ gnutar gzip nix ]}
		@@ -165,6 +165,12 @@

		dontInstall = true;

		impureEnvVars = lib.fetchers.proxyImpureEnvVars;

		SSL_CERT_FILE = if (hash_.outputHash == "" \|\| hash_.outputHash == lib.fakeSha256 \|\| hash_.outputHash == lib.fakeSha512 \|\| hash_.outputHash == lib.fakeHash)
		then "${cacert}/etc/ssl/certs/ca-bundle.crt"
		else "/no-cert-file.crt";

		outputHashMode = "recursive";
		} // hash_ // forceGitDeps_);
		}

pkgs/build-support/node/fetch-npm-deps/src/main.rs

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ use walkdir::WalkDir;

		mod cacache;
		mod parse;
		mod util;

		fn cache_map_path() -> Option<PathBuf> {
		env::var_os("CACHE_MAP_PATH").map(PathBuf::from)

pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs

+6 −33

Original line number	Diff line number	Diff line
		@@ -3,15 +3,15 @@ use lock::UrlOrString;
		use rayon::prelude::*;
		use serde_json::{Map, Value};
		use std::{
		fs, io,
		fs,
		io::{self, Read},
		process::{Command, Stdio},
		thread,
		time::Duration,
		};
		use tempfile::{tempdir, TempDir};
		use ureq::{Error, ErrorKind, Response};
		use url::Url;

		use crate::util;

		pub mod lock;

		pub fn lockfile(content: &str, force_git_deps: bool) -> anyhow::Result<Vec<Package>> {
		@@ -106,7 +106,7 @@ impl Package {

		let specifics = match get_hosted_git_url(&resolved)? {
		Some(hosted) => {
		let mut body = get_response(hosted.as_str())?.into_reader();
		let mut body = util::get_url_with_retry(&hosted)?;

		let workdir = tempdir()?;

		@@ -157,9 +157,7 @@ impl Package {
		Specifics::Registry { .. } => {
		let mut body = Vec::new();

		get_response(self.url.as_str())?
		.into_reader()
		.read_to_end(&mut body)?;
		util::get_url_with_retry(&self.url)?.read_to_end(&mut body)?;

		Ok(body)
		}
		@@ -191,31 +189,6 @@ impl Package {
		}
		}

		#[allow(clippy::result_large_err)]
		fn get_response(url: &str) -> Result<Response, Error> {
		for _ in 0..4 {
		match ureq::get(url).call() {
		Err(Error::Status(503 \| 429, r)) => {
		let retry: Option<u64> = r.header("retry-after").and_then(\|h\| h.parse().ok());
		let retry = retry.unwrap_or(5);
		eprintln!("{} for {}, retry in {}", r.status(), r.get_url(), retry);
		thread::sleep(Duration::from_secs(retry));
		}
		Err(Error::Transport(t)) => match t.kind() {
		ErrorKind::ConnectionFailed \| ErrorKind::Dns \| ErrorKind::Io => {
		let retry = 5;
		eprintln!("{} for {}, retry in {}", t.kind(), url, retry);
		thread::sleep(Duration::from_secs(retry));
		}
		_ => return Err(Error::Transport(t)),
		},
		result => return result,
		};
		}
		// Ran out of retries; try one last time and return whatever result we get.
		ureq::get(url).call()
		}

		#[allow(clippy::case_sensitive_file_extension_comparisons)]
		fn get_hosted_git_url(url: &Url) -> anyhow::Result<Option<Url>> {
		if ["git", "git+ssh", "git+https", "ssh"].contains(&url.scheme()) {

Admin message