Loading pkgs/by-name/ze/zed-editor/0001-fix-duplicate-reqwest.patchdeleted 100644 → 0 +0 −48 Original line number Diff line number Diff line diff --git a/Cargo.lock b/Cargo.lock index 22427fb..75a924a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12162,43 +12162,6 @@ dependencies = [ "winreg 0.50.0", ] -[[package]] -name = "reqwest" -version = "0.12.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" -dependencies = [ - "base64 0.22.1", - "bytes 1.10.1", - "futures-channel", - "futures-core", - "futures-util", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "hyper 1.6.0", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.2", - "tokio", - "tower 0.5.2", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-registry 0.4.0", -] - [[package]] name = "reqwest" version = "0.12.15" pkgs/by-name/ze/zed-editor/package.nix +3 −12 Original line number Diff line number Diff line Loading @@ -101,7 +101,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; version = "0.207.4"; version = "0.208.4"; outputs = [ "out" Loading @@ -114,23 +114,14 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; hash = "sha256-IKACHMKHIyq8UuqWlA6U/cdCi+wrevZwl2CINSWmmRc="; hash = "sha256-t8HSmvTaMtpJH0y21zpqP8vkG1rhYn/uXVccNaj9dcc="; }; cargoPatches = [ ./0001-fix-duplicate-reqwest.patch ]; postPatch = '' # Dynamically link WebRTC instead of static substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \ --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" # Zed team renamed the function but forgot to update its usage in this file # We rename it ourselves for now, until upstream fixes the issue substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \ --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)" # The generate-licenses script wants a specific version of cargo-about eventhough # newer versions work just as well. substituteInPlace script/generate-licenses \ Loading @@ -143,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; cargoHash = "sha256-jv8ytsttXFG5VlFWI885zLJsZn8rFkiFdPhUvNKOwpY="; cargoHash = "sha256-0Ezuyvj0xSKFJtHB1kgUvyojcMV1RISOtutmlvWIZVM="; nativeBuildInputs = [ cmake Loading Loading
pkgs/by-name/ze/zed-editor/0001-fix-duplicate-reqwest.patchdeleted 100644 → 0 +0 −48 Original line number Diff line number Diff line diff --git a/Cargo.lock b/Cargo.lock index 22427fb..75a924a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12162,43 +12162,6 @@ dependencies = [ "winreg 0.50.0", ] -[[package]] -name = "reqwest" -version = "0.12.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" -dependencies = [ - "base64 0.22.1", - "bytes 1.10.1", - "futures-channel", - "futures-core", - "futures-util", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "hyper 1.6.0", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.2", - "tokio", - "tower 0.5.2", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-registry 0.4.0", -] - [[package]] name = "reqwest" version = "0.12.15"
pkgs/by-name/ze/zed-editor/package.nix +3 −12 Original line number Diff line number Diff line Loading @@ -101,7 +101,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; version = "0.207.4"; version = "0.208.4"; outputs = [ "out" Loading @@ -114,23 +114,14 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; hash = "sha256-IKACHMKHIyq8UuqWlA6U/cdCi+wrevZwl2CINSWmmRc="; hash = "sha256-t8HSmvTaMtpJH0y21zpqP8vkG1rhYn/uXVccNaj9dcc="; }; cargoPatches = [ ./0001-fix-duplicate-reqwest.patch ]; postPatch = '' # Dynamically link WebRTC instead of static substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \ --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" # Zed team renamed the function but forgot to update its usage in this file # We rename it ourselves for now, until upstream fixes the issue substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \ --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)" # The generate-licenses script wants a specific version of cargo-about eventhough # newer versions work just as well. substituteInPlace script/generate-licenses \ Loading @@ -143,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; cargoHash = "sha256-jv8ytsttXFG5VlFWI885zLJsZn8rFkiFdPhUvNKOwpY="; cargoHash = "sha256-0Ezuyvj0xSKFJtHB1kgUvyojcMV1RISOtutmlvWIZVM="; nativeBuildInputs = [ cmake Loading