zed-editor: 0.184.10 -> 0.186.8 (#407051)

authored by Gaétan Lepage and committed by GitHub 759a78a5 51b28085

+60 -3
+48
pkgs/by-name/ze/zed-editor/0002-fix-duplicate-reqwest.patch
··· 1 + diff --git a/Cargo.lock b/Cargo.lock 2 + index 22427fb..75a924a 100644 3 + --- a/Cargo.lock 4 + +++ b/Cargo.lock 5 + @@ -12162,43 +12162,6 @@ dependencies = [ 6 + "winreg 0.50.0", 7 + ] 8 + 9 + -[[package]] 10 + -name = "reqwest" 11 + -version = "0.12.15" 12 + -source = "registry+https://github.com/rust-lang/crates.io-index" 13 + -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" 14 + -dependencies = [ 15 + - "base64 0.22.1", 16 + - "bytes 1.10.1", 17 + - "futures-channel", 18 + - "futures-core", 19 + - "futures-util", 20 + - "http 1.3.1", 21 + - "http-body 1.0.1", 22 + - "http-body-util", 23 + - "hyper 1.6.0", 24 + - "hyper-util", 25 + - "ipnet", 26 + - "js-sys", 27 + - "log", 28 + - "mime", 29 + - "once_cell", 30 + - "percent-encoding", 31 + - "pin-project-lite", 32 + - "serde", 33 + - "serde_json", 34 + - "serde_urlencoded", 35 + - "sync_wrapper 1.0.2", 36 + - "tokio", 37 + - "tower 0.5.2", 38 + - "tower-service", 39 + - "url", 40 + - "wasm-bindgen", 41 + - "wasm-bindgen-futures", 42 + - "web-sys", 43 + - "windows-registry 0.4.0", 44 + -] 45 + - 46 + [[package]] 47 + name = "reqwest" 48 + version = "0.12.15"
+12 -3
pkgs/by-name/ze/zed-editor/package.nix
··· 99 99 in 100 100 rustPlatform.buildRustPackage (finalAttrs: { 101 101 pname = "zed-editor"; 102 - version = "0.184.10"; 102 + version = "0.186.8"; 103 103 104 104 outputs = 105 105 [ "out" ] ··· 111 111 owner = "zed-industries"; 112 112 repo = "zed"; 113 113 tag = "v${finalAttrs.version}"; 114 - hash = "sha256-AtccwZueh4kJZNWR+wUkPx5pe4izyTrm4LJYe99OyaM="; 114 + hash = "sha256-oSmwEtF8VWSKcBlL11MMThBAJFisXwWQjZAzcNIptt0="; 115 115 }; 116 116 117 117 patches = [ ··· 119 119 # but builds fine with our standard linker. 120 120 # This patch removes their linker override from the cargo config. 121 121 ./0001-linux-linker.patch 122 + ]; 123 + 124 + cargoPatches = [ 125 + ./0002-fix-duplicate-reqwest.patch 122 126 ]; 123 127 124 128 postPatch = ··· 126 130 '' 127 131 substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \ 128 132 --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" 133 + 134 + # Zed team renamed the function but forgot to update its usage in this file 135 + # We rename it ourselves for now, until upstream fixes the issue 136 + substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \ 137 + --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)" 129 138 ''; 130 139 131 140 useFetchCargoVendor = true; 132 - cargoHash = "sha256-Kd6z3oUuiqLpOC6J2GZTTQd+1bKCnJNtfBgaWJkN0ho="; 141 + cargoHash = "sha256-WH6cQa6DChkUtqh+irIz2hJd5/RW/oln+TZPHunEmNk="; 133 142 134 143 nativeBuildInputs = 135 144 [