mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-07-03 03:44:06 +02:00
Danny Milosavljevic
2c51b803e3
* gnu/packages/patches/zed-0.225.10-add-guix-container-support.patch: New file. * gnu/packages/patches/zed-0.225.10-collapse-multiline-git-deps.patch: New file. * gnu/packages/patches/zed-0.225.10-disable-dlopen.patch: New file. * gnu/packages/patches/zed-0.225.10-exclude-libwebrtc-from-audio.patch: New file. * gnu/packages/patches/zed-0.225.10-fix-sqlite-memory-mode.patch: New file. * gnu/packages/patches/zed-0.225.10-fix-test-db-isolation.patch: New file. * gnu/packages/patches/zed-0.225.10-fix-workspace-race.patch: New file. * gnu/packages/patches/zed-0.225.10-keep-regular-file-workspaces.patch: New file. * gnu/packages/patches/zed-0.225.10-remove-patch-crates-io.patch: New file. * gnu/packages/patches/zed-0.225.10-use-mock-livekit-on-linux.patch: New file. * gnu/packages/patches/rust-candle-0.9.1-add-candle-onnx-to-workspace.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/rust-sources.scm (rust-alacritty-0.25.1.9d9640d, rust-candle-0.9.1.724d75e, rust-dap-types-0.0.1.1b461b3, rust-gh-workflow-0.8.0.c9eac0e, rust-livekit-0.7.8.5f04705, rust-notify-8.2.0.ce58c24, rust-pet-0.1.0.d5b5bb0, rust-tiktoken-rs-0.9.1.2570c43, rust-zed-xim-0.4.0-zed.16f35a2): New variables. * gnu/packages/rust-crates.scm (lookup-cargo-inputs): Modify. * gnu/packages/text-editors.scm (zed): New variable. Change-Id: I16d4c5431e3398261ac4eb74483747c09cf74449
66 lines
3.7 KiB
Diff
66 lines
3.7 KiB
Diff
Author: Danny Milosavljevic <dannym@friendly-machines.com>
|
|
Subject: Collapse multi-line git dependency entries to single lines
|
|
Date: 2026-03-01
|
|
License: expat
|
|
|
|
Collapse multi-line git dependency entries to single lines so that
|
|
line-based substitute* patterns can process them.
|
|
|
|
--- a/Cargo.toml 2026-03-01 19:09:53.710020628 +0000
|
|
+++ b/Cargo.toml 2026-03-01 19:20:31.697337662 +0000
|
|
@@ -626,15 +626,7 @@
|
|
rayon = "1.8"
|
|
regex = "1.5"
|
|
# WARNING: If you change this, you must also publish a new version of zed-reqwest to crates.io
|
|
-reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662463bda39148ba154100dd44d3fba5873a4", default-features = false, features = [
|
|
- "charset",
|
|
- "http2",
|
|
- "macos-system-configuration",
|
|
- "multipart",
|
|
- "rustls-tls-native-roots",
|
|
- "socks",
|
|
- "stream",
|
|
-], package = "zed-reqwest", version = "0.12.15-zed" }
|
|
+reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662463bda39148ba154100dd44d3fba5873a4", default-features = false, features = ["charset", "http2", "macos-system-configuration", "multipart", "rustls-tls-native-roots", "socks", "stream"], package = "zed-reqwest", version = "0.12.15-zed" }
|
|
rsa = "0.9.6"
|
|
runtimelib = { version = "1.2.0", default-features = false, features = [
|
|
"async-dispatcher-runtime", "aws-lc-rs"
|
|
--- a/crates/gpui/Cargo.toml 2026-03-01 19:12:33.129039363 +0000
|
|
+++ b/crates/gpui/Cargo.toml 2026-03-01 19:20:33.133327405 +0000
|
|
@@ -167,9 +167,7 @@
|
|
cosmic-text = { version = "0.17.0", optional = true }
|
|
swash = { version = "0.2.6" }
|
|
# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
|
|
-font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", features = [
|
|
- "source-fontconfig-dlopen",
|
|
-], optional = true }
|
|
+font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "110523127440aefb11ce0cf280ae7c5071337ec5", package = "zed-font-kit", version = "0.14.1-zed", features = ["source-fontconfig-dlopen"], optional = true }
|
|
calloop = "0.14.3"
|
|
filedescriptor = { version = "0.8.2", optional = true }
|
|
open = { version = "5.2.0", optional = true }
|
|
@@ -207,10 +205,7 @@
|
|
"sync",
|
|
], optional = true }
|
|
# WARNING: If you change this, you must also publish a new version of zed-xim to crates.io
|
|
-xim = { git = "https://github.com/zed-industries/xim-rs.git", rev = "16f35a2c881b815a2b6cdfd6687988e84f8447d8" , features = [
|
|
- "x11rb-xcb",
|
|
- "x11rb-client",
|
|
-], package = "zed-xim", version = "0.4.0-zed", optional = true }
|
|
+xim = { git = "https://github.com/zed-industries/xim-rs.git", rev = "16f35a2c881b815a2b6cdfd6687988e84f8447d8" , features = ["x11rb-xcb", "x11rb-client"], package = "zed-xim", version = "0.4.0-zed", optional = true }
|
|
x11-clipboard = { version = "0.9.3", optional = true }
|
|
|
|
[target.'cfg(target_os = "windows")'.dependencies]
|
|
--- a/crates/livekit_client/Cargo.toml 2026-03-01 19:12:33.133661336 +0000
|
|
+++ b/crates/livekit_client/Cargo.toml 2026-03-01 19:20:33.893321975 +0000
|
|
@@ -46,9 +46,7 @@
|
|
|
|
[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
|
|
libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
|
|
-livekit = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks", features = [
|
|
- "__rustls-tls"
|
|
-] }
|
|
+livekit = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks", features = ["__rustls-tls"] }
|
|
|
|
[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
|
|
scap.workspace = true
|