gnu: googletest: Drop input labels.

* gnu/packages/check.scm (googletest)[native-inputs]: Drop input labels. Change-Id: I588976a404ebeb2613ccc13d52b9a4d5b1de5903 Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
gnu: sbcl-coalton: Update to 0.0.1-5.bf475c8.
2026-04-15 13:13:12 +09:00 · 2026-04-14 22:03:56 -04:00 · 2026-04-15 03:19:10 +02:00 · 2026-04-14 19:16:11 -04:00 · 2026-04-14 22:58:15 +02:00 · 2026-04-14 22:38:26 +02:00
27 changed files with 9341 additions and 66 deletions
@@ -26,7 +26,6 @@

 (define %sundry-texlive-packages
  (list bibtool
-        dvisvgm
        rubber
        texmaker
        texstudio
@@ -2386,6 +2386,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/rust-1.70-fix-rustix-build.patch	\
  %D%/packages/patches/rust-1.78-unwinding-fix.patch		\
  %D%/packages/patches/rust-1.81-fix-riscv64-bootstrap.patch	\
+  %D%/packages/patches/rust-candle-0.9.1-add-candle-onnx-to-workspace.patch	\
  %D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch	\
  %D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch	\
  %D%/packages/patches/rust-codex-0.98.0-test-timeout.patch	\
@@ -2624,6 +2625,17 @@ dist_patch_DATA =						\
  %D%/packages/patches/yggdrasil-extra-config.patch	\
  %D%/packages/patches/ypsilon-Use-GNU-toolchain-as-default.patch	\
  %D%/packages/patches/zabbix-agent2-test-timezone-fix.patch	\
+  %D%/packages/patches/zed-0.225.10-add-message-notification-action.patch \
+  %D%/packages/patches/zed-0.225.10-add-guix-container-support.patch	\
+  %D%/packages/patches/zed-0.225.10-collapse-multiline-git-deps.patch	\
+  %D%/packages/patches/zed-0.225.10-exclude-libwebrtc-from-audio.patch		\
+  %D%/packages/patches/zed-0.225.10-disable-dlopen.patch	\
+  %D%/packages/patches/zed-0.225.10-fix-sqlite-memory-mode.patch	\
+  %D%/packages/patches/zed-0.225.10-fix-test-db-isolation.patch	\
+  %D%/packages/patches/zed-0.225.10-fix-workspace-race.patch	\
+  %D%/packages/patches/zed-0.225.10-keep-regular-file-workspaces.patch	\
+  %D%/packages/patches/zed-0.225.10-remove-patch-crates-io.patch	\
+  %D%/packages/patches/zed-0.225.10-use-mock-livekit-on-linux.patch	\
  %D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch	\
  %D%/packages/patches/zig-0.9-fix-runpath.patch		\
  %D%/packages/patches/zig-0.9-riscv-support.patch		\
@@ -95,8 +95,8 @@ supported content to the Kodi media center.")
  ;; Arbitrary commit of branch master,
  ;; Update when updating uBlockOrigin.
  (let* ((name "ublock-main-assets")
-         (commit "011eef4a5b36a7ebf4adedc486d96b77cfa25c54")
-         (revision "5")
+         (commit "004af606e6a0efc22bc65ab1016b553441cacb71")
+         (revision "6")
         (version (git-version "0" revision commit)))
    (origin
      (method git-fetch)
@@ -105,14 +105,14 @@ supported content to the Kodi media center.")
            (commit commit)))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "0ng8a88zdvrxg30fz83gswjy27b3hfx9q11n2i715id7az7kqf9x")))))
+       (base32 "1bfd2d53flrkgvjcr1kj9nbxj4y9a4pcr7m3dycccdhd21x6k0ln")))))

 (define ublock-prod-assets
  ;; Arbitrary commit of branch gh-pages,
  ;; Update when updating uBlockOrigin.
  (let* ((name "ublock-prod-assets")
-         (commit "6844322800de647da0c4fe06dd6a0b212a3942e4")
-         (revision "5")
+         (commit "6c15e4ef91888c610caf73829dc78ae9549ed24a")
+         (revision "6")
         (version (git-version "0" revision commit)))
    (origin
      (method git-fetch)
@@ -121,12 +121,12 @@ supported content to the Kodi media center.")
            (commit commit)))
      (file-name (git-file-name name version))
      (sha256
-       (base32 "13vxq4z1wxivz5xklncxd2sj5aqkyhq919vzbbfp0fgh0imhikib")))))
+       (base32 "0n2h6drqh44b1zgl729bfr70n08mkm536a2vqgivw7dm5dmi8zd3")))))

 (define ublock-origin
  (package
    (name "ublock-origin")
-    (version "1.66.2")
+    (version "1.70.0")
    (home-page "https://github.com/gorhill/uBlock")
    (source (origin
              (method git-fetch)
@@ -136,7 +136,7 @@ supported content to the Kodi media center.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "16ph031hb8bf4rxyxvm6jr0bxmy0snza11jfrbjgfb390gax9r63"))))
+                "0j1m80nz86yc69c42hv5di5zza0vkycqmjaydb9jgx0abcvi19x5"))))
    (build-system gnu-build-system)
    (outputs '("xpi" "firefox" "chromium"))
    (properties '((addon-id . "uBlock0@raymondhill.net")))
@@ -1140,8 +1140,7 @@ Anything Protocol} compliant programs can also be executed through Kyua.")
    (arguments
     `(#:tests? #f
       #:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
-    (native-inputs
-     `(("python" ,python-wrapper)))
+    (native-inputs (list python-wrapper))
    (home-page "https://github.com/google/googletest/")
    (synopsis "Test discovery and XUnit test framework")
    (description "Google Test features an XUnit test framework, automated test
@@ -714,7 +714,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
 (define-public podman
  (package
    (name "podman")
-    (version "5.8.1")
+    (version "5.8.2")
    (outputs '("out" "docker"))
    (properties
     `((output-synopsis "docker" "docker alias for podman")
@@ -727,7 +727,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
             (url "https://github.com/containers/podman")
             (commit (string-append "v" version))))
       (sha256
-        (base32 "1wdsdc0nj4m1v8mn95dhavi87ad0adqmld70da59gvp2abff5f0f"))
+        (base32 "12bmzbfyjsf0mwnam38cw9ib54wj1znh5b7lxzdyll9cvvkhqisr"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (arguments
@@ -5787,6 +5787,43 @@ reading and writing PNG data, as well as some graphic primitives and basic image
 processing filters.")
    (license license:gpl3+)))

+(define-public guile-pnm
+  (package
+    (name "guile-pnm")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/artyom-poptsov/guile-pnm")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1yvsni4hll20g99zq4wl734f9i8gpjr1sqsnk3a93k2dd7b6ymac"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags
+      #~(list "GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
+    (native-inputs (list autoconf
+                         automake
+                         pkg-config
+                         texinfo
+                         ;; needed when cross-compiling.
+                         guile-3.0
+                         guile-lib
+                         guile-smc))
+    (inputs (list guile-3.0 guile-lib))
+    (propagated-inputs (list guile-smc))
+    (home-page "https://github.com/artyom-poptsov/guile-pnm")
+    (synopsis "NetBPM (PNM) library for GNU Guile")
+    (description
+     "@code{guile-pnm} is a GNU Guile library for working with the
+@url{https://en.wikipedia.org/wiki/Netpbm, NetPBM} format (also known as PNM),
+including portable bitmap (PBM), portable graymap (PGM) and portable
+pixel (PPM) variants.")
+    (license license:gpl3+)))
+
 (define-public guile-cv
  (package
    (name "guile-cv")
@@ -12982,8 +12982,8 @@ score.  When evaluated, the musical score is rendered to an image.")
  (sbcl-package->ecl-package sbcl-cmn))

 (define-public sbcl-coalton
-  (let ((commit "939342495f55991812c2c2767322c5e51e755216")
-        (revision "4"))
+  (let ((commit "bf475c8c53e02a2e0cb29deab4d101d25743bfca")
+        (revision "5"))
    (package
      (name "sbcl-coalton")
      (version (git-version "0.0.1" revision commit))
@@ -12995,7 +12995,7 @@ score.  When evaluated, the musical score is rendered to an image.")
               (commit commit)))
         (file-name (git-file-name "cl-coalton" version))
         (sha256
-          (base32 "08qzj3v4fvn9h87whyqg650rpap8lva7jr94d1akv6m2z62l5q68"))))
+          (base32 "0zrp2s82n2mxx7knbnbsdj64zar21nnnf8iwzrqzs4g3v6xpyz9z"))))
      (build-system asdf-build-system/sbcl)
      (native-inputs
       (list sbcl-fiasco))
@@ -33,6 +33,7 @@
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
 ;;; Copyright © 2024 David Pflug <david@pflug.io>
 ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2026 Igorj Gorjaĉev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -912,7 +913,7 @@ assembler, PEG) is less than 1MB.")
 (define-public jpm
  (package
    (name "jpm")
-    (version "1.1.0")
+    (version "1.2.0")
    (source
     (origin
       (method git-fetch)
@@ -921,7 +922,7 @@ assembler, PEG) is less than 1MB.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "05rdxigmiy7vf93s16a8n2029lq33073jccz1rjl4iisxj6piw4l"))))
+        (base32 "06ywq1ajvqx3lfpldwbakc21hxhb313r0196xnmrrbb6k1f8hsfx"))))
    (build-system copy-build-system)
    (arguments
     (list
@@ -0,0 +1,21 @@
+Author: Danny Milosavljevic <dannym@friendly-machines.com>
+Subject: Move candle-onnx from exclude to members so cargo package can build it.
+Date: 2026-03-01
+
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -4,6 +4,7 @@
+     "candle-datasets",
+     "candle-examples",
+     "candle-nn",
+    "candle-onnx",
+     "candle-pyo3",
+     "candle-transformers",
+     "candle-wasm-examples/*",
+@@ -15,7 +16,6 @@
+     "candle-flash-attn",
+     "candle-kernels",
+     "candle-metal-kernels",
+-    "candle-onnx",
+ ]
+ resolver = "2"
@@ -0,0 +1,107 @@
+Author: Danny Milosavljevic <dannym@friendly-machines.com>
+Subject: Add non-dismissing notification action hooks.
+Date: 2026-03-08
+License: gpl3+
+
+MessageNotification only supports primary and secondary buttons that always
+dismiss the notification after running their handlers. That is too restrictive
+for flows where the user needs to inspect something first and then return to the
+same prompt.
+
+Add a generic non-dismissing `more_info_on_click` action alongside the existing
+URL-based more-info button. This keeps the notification component reusable for
+"inspect first, decide second" workflows without forcing every caller to build a
+custom notification view.
+diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
+index 84f479b77e..9e210cb554 100644
+--- a/crates/workspace/src/notifications.rs
+++ b/crates/workspace/src/notifications.rs
+@@ -714,6 +714,7 @@ pub mod simple_message_notification {
+         secondary_icon_color: Option<Color>,
+         secondary_on_click: Option<Arc<dyn Fn(&mut Window, &mut Context<Self>)>>,
+         more_info_message: Option<SharedString>,
+        more_info_on_click: Option<Arc<dyn Fn(&mut Window, &mut Context<Self>)>>,
+         more_info_url: Option<Arc<str>>,
+         show_close_button: bool,
+         show_suppress_button: bool,
+@@ -758,6 +759,7 @@ pub mod simple_message_notification {
+                 secondary_icon_color: None,
+                 secondary_on_click: None,
+                 more_info_message: None,
+                more_info_on_click: None,
+                 more_info_url: None,
+                 show_close_button: true,
+                 show_suppress_button: true,
+@@ -843,6 +845,22 @@ pub mod simple_message_notification {
+             self
+         }
+ 
+        pub fn more_info_on_click<F>(mut self, on_click: F) -> Self
+        where
+            F: 'static + Fn(&mut Window, &mut Context<Self>),
+        {
+            self.more_info_on_click = Some(Arc::new(on_click));
+            self
+        }
+
+        pub fn more_info_on_click_arc<F>(mut self, on_click: Arc<F>) -> Self
+        where
+            F: 'static + Fn(&mut Window, &mut Context<Self>),
+        {
+            self.more_info_on_click = Some(on_click);
+            self
+        }
+
+         pub fn more_info_url<S>(mut self, url: S) -> Self
+         where
+             S: Into<Arc<str>>,
+@@ -946,20 +964,36 @@ pub mod simple_message_notification {
+                         }))
+                         .child(
+                             h_flex().w_full().justify_end().children(
+-                                self.more_info_message
+-                                    .iter()
+-                                    .zip(self.more_info_url.iter())
+-                                    .map(|(message, url)| {
+-                                        let url = url.clone();
+-                                        Button::new(message.clone(), message.clone())
+-                                            .label_size(LabelSize::Small)
+-                                            .icon(IconName::ArrowUpRight)
+-                                            .icon_size(IconSize::Indicator)
+-                                            .icon_color(Color::Muted)
+-                                            .on_click(cx.listener(move |_, _, _, cx| {
+                                self.more_info_message.iter().filter_map(|message| {
+                                    let more_info_on_click = self.more_info_on_click.clone();
+                                    let more_info_url = self.more_info_url.clone();
+
+                                    if more_info_on_click.is_none() && more_info_url.is_none() {
+                                        return None;
+                                    }
+
+                                    let mut button = Button::new(message.clone(), message.clone())
+                                        .label_size(LabelSize::Small)
+                                        .icon(IconName::ArrowUpRight)
+                                        .icon_size(IconSize::Indicator)
+                                        .icon_color(Color::Muted);
+
+                                    button = match (more_info_on_click, more_info_url) {
+                                        (Some(on_click), _) => button.on_click(cx.listener(
+                                            move |_, _, window, cx| {
+                                                (on_click)(window, cx);
+                                            },
+                                        )),
+                                        (None, Some(url)) => button.on_click(cx.listener(
+                                            move |_, _, _, cx| {
+                                                 cx.open_url(&url);
+-                                            }))
+-                                    }),
+                                            },
+                                        )),
+                                        (None, None) => button,
+                                    };
+
+                                    Some(button)
+                                }),
+                             ),
+                         ),
+                 )
@@ -0,0 +1,65 @@
+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
@@ -0,0 +1,31 @@
+Author: Danny Milosavljevic <dannym@friendly-machines.com>
+Subject: Disable dlopen for wayland-backend and fontconfig in gpui.
+Date: 2026-03-01
+License: ASL2.0
+
+Remove the "dlopen" feature from wayland-backend and the
+"source-fontconfig-dlopen" feature from zed-font-kit so that libwayland
+and libfontconfig are linked directly rather than loaded at runtime via
+dlopen.  This ensures these dependencies are visible to the package
+manager and avoids runtime failures when the libraries are not in the
+dlopen search path.
+
+--- a/crates/gpui/Cargo.toml	2026-03-01 21:21:38.661240897 +0000
+++ b/crates/gpui/Cargo.toml	2026-03-01 21:23:00.282205935 +0000
+@@ -167,7 +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", optional = true }
+ calloop = "0.14.3"
+ filedescriptor = { version = "0.8.2", optional = true }
+ open = { version = "5.2.0", optional = true }
+@@ -177,7 +177,6 @@
+ calloop-wayland-source = { version = "0.4.1", optional = true }
+ wayland-backend = { version = "0.3.3", features = [
+     "client_system",
+-    "dlopen",
+ ], optional = true }
+ wayland-client = { version = "0.31.11", optional = true }
+ wayland-cursor = { version = "0.31.11", optional = true }
@@ -0,0 +1,113 @@
+Author: Danny Milosavljevic <dannym@friendly-machines.com>
+Subject: Exclude libwebrtc dependency from audio crate on Linux.
+Date: 2026-03-01
+
+The audio crate conditionally depends on libwebrtc for echo cancellation
+on platforms that have it.  It already cfg-guards the libwebrtc usage for
+Windows-GNU and FreeBSD.  Add target_os = "linux" to those cfg conditions
+so libwebrtc is not required on Linux either.  The rest of the audio crate
+(sound playback, output streams, end_call) continues to work without it.
+
+--- a/crates/audio/Cargo.toml	2026-03-01 21:21:38.652107544 +0000
+++ b/crates/audio/Cargo.toml	2026-03-01 21:22:20.494478427 +0000
+@@ -29,5 +29,5 @@
+ thiserror.workspace = true
+ util.workspace = true
+ 
+-[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
+[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))'.dependencies]
+ libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
+--- a/crates/audio/src/audio.rs	2026-03-01 21:21:38.656793329 +0000
+++ b/crates/audio/src/audio.rs	2026-03-01 21:40:18.939230433 +0000
+@@ -6,7 +6,7 @@
+ };
+ use gpui::{App, AsyncApp, BackgroundExecutor, BorrowAppContext, Global};
+ 
+-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
+ mod non_windows_and_freebsd_deps {
+     pub(super) use cpal::Sample;
+     pub(super) use libwebrtc::native::apm;
+@@ -15,7 +15,7 @@
+     pub(super) use std::sync::Arc;
+ }
+ 
+-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
+ use non_windows_and_freebsd_deps::*;
+ 
+ use rodio::{
+@@ -102,7 +102,7 @@
+ 
+ pub struct Audio {
+     output_handle: Option<MixerDeviceSink>,
+-    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
+    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
+     pub echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
+     source_cache: HashMap<Sound, Buffered<Decoder<Cursor<Vec<u8>>>>>,
+     replays: replays::Replays,
+@@ -114,7 +114,7 @@
+             output_handle: Default::default(),
+             #[cfg(not(any(
+                 all(target_os = "windows", target_env = "gnu"),
+-                target_os = "freebsd"
+                target_os = "freebsd", target_os = "linux"
+             )))]
+             echo_canceller: Arc::new(Mutex::new(apm::AudioProcessingModule::new(
+                 true, false, false, false,
+@@ -140,13 +140,13 @@
+             // The webrtc apm is not yet compiling for windows & freebsd
+             #[cfg(not(any(
+                 any(all(target_os = "windows", target_env = "gnu")),
+-                target_os = "freebsd"
+                target_os = "freebsd", target_os = "linux"
+             )))]
+             let echo_canceller = Arc::clone(&self.echo_canceller);
+ 
+             #[cfg(not(any(
+                 any(all(target_os = "windows", target_env = "gnu")),
+-                target_os = "freebsd"
+                target_os = "freebsd", target_os = "linux"
+             )))]
+             {
+                 let source = rodio::source::Zero::new(CHANNEL_COUNT, SAMPLE_RATE)
+@@ -166,10 +166,10 @@
+ 
+             #[cfg(any(
+                 any(all(target_os = "windows", target_env = "gnu")),
+-                target_os = "freebsd"
+                target_os = "freebsd", target_os = "linux"
+             ))]
+             {
+-                let source = rodio::source::Zero::<f32>::new(CHANNEL_COUNT, SAMPLE_RATE);
+                let source = rodio::source::Zero::new(CHANNEL_COUNT, SAMPLE_RATE);
+                 output_handle.mixer().add(source);
+             }
+ 
+@@ -190,7 +190,7 @@
+         self.replays.replays_to_tar(executor)
+     }
+ 
+-    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
+    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
+     pub fn open_microphone(voip_parts: VoipParts) -> anyhow::Result<impl Source> {
+         let stream = open_input_stream(voip_parts.input_audio_device)?;
+         let stream = stream
+@@ -319,7 +319,7 @@
+     }
+ }
+ 
+-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
+ pub struct VoipParts {
+     echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
+     replays: replays::Replays,
+@@ -327,7 +327,7 @@
+     input_audio_device: Option<DeviceId>,
+ }
+ 
+-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
+#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))]
+ impl VoipParts {
+     pub fn new(cx: &AsyncApp) -> anyhow::Result<Self> {
+         let (apm, replays) = cx.read_default_global::<Audio, _>(|audio, _| {
@@ -0,0 +1,320 @@
+From: Danny Milosavljevic <dannym@friendly-machines.com>
+Date: Fri, 6 Mar 2026 21:06:00 +0000
+Subject: [PATCH] sqlez: Fix named in-memory SQLite mode
+License: expat
+
+Zed's named "in-memory" SQLite databases were being opened with
+URI-looking paths such as `file:DB?mode=memory&cache=shared` but without
+`SQLITE_OPEN_URI`. SQLite therefore treated those strings as literal
+filenames, which leaked test databases to disk and defeated the intended
+shared-memory behavior.
+
+Fix that by opening named in-memory databases with `SQLITE_OPEN_URI` so
+`mode=memory&cache=shared` is interpreted correctly, and add coverage to
+ensure no literal backing files are created.
+
+That URI fix makes shared-cache schema locking real, which in turn
+exposes a second bug in `ThreadSafeConnection`: per-thread connection
+initialization can race schema setup on another connection to the same
+named in-memory database and fail while preparing `PRAGMA foreign_keys`.
+
+Fix that by retrying connection initialization queries when SQLite
+reports a transient schema/database lock, and add a regression test for
+that case.
+
+diff --git a/crates/sqlez/src/connection.rs b/crates/sqlez/src/connection.rs
+index 53f0d4e261..3dc530757a 100644
+--- a/crates/sqlez/src/connection.rs
+++ b/crates/sqlez/src/connection.rs
+@@ -18,7 +18,7 @@ pub struct Connection {
+ unsafe impl Send for Connection {}
+ 
+ impl Connection {
+-    pub(crate) fn open(uri: &str, persistent: bool) -> Result<Self> {
+    fn open_with_flags(uri: &str, persistent: bool, flags: i32) -> Result<Self> {
+         let mut connection = Self {
+             sqlite3: ptr::null_mut(),
+             persistent,
+@@ -26,7 +26,6 @@ impl Connection {
+             _sqlite: PhantomData,
+         };
+ 
+-        let flags = SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX | SQLITE_OPEN_READWRITE;
+         unsafe {
+             sqlite3_open_v2(
+                 CString::new(uri)?.as_ptr(),
+@@ -44,6 +43,14 @@ impl Connection {
+         Ok(connection)
+     }
+ 
+    pub(crate) fn open(uri: &str, persistent: bool) -> Result<Self> {
+        Self::open_with_flags(
+            uri,
+            persistent,
+            SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX | SQLITE_OPEN_READWRITE,
+        )
+    }
+
+     /// Attempts to open the database at uri. If it fails, a shared memory db will be opened
+     /// instead.
+     pub fn open_file(uri: &str) -> Self {
+@@ -51,13 +58,20 @@ impl Connection {
+     }
+ 
+     pub fn open_memory(uri: Option<&str>) -> Self {
+-        let in_memory_path = if let Some(uri) = uri {
+-            format!("file:{}?mode=memory&cache=shared", uri)
+        if let Some(uri) = uri {
+            let in_memory_path = format!("file:{}?mode=memory&cache=shared", uri);
+            return Self::open_with_flags(
+                &in_memory_path,
+                false,
+                SQLITE_OPEN_CREATE
+                    | SQLITE_OPEN_NOMUTEX
+                    | SQLITE_OPEN_READWRITE
+                    | SQLITE_OPEN_URI,
+            )
+            .expect("Could not create fallback in memory db");
+         } else {
+-            ":memory:".to_string()
+-        };
+-
+-        Self::open(&in_memory_path, false).expect("Could not create fallback in memory db")
+            Self::open(":memory:", false).expect("Could not create fallback in memory db")
+        }
+     }
+ 
+     pub fn persistent(&self) -> bool {
+@@ -265,9 +279,50 @@ impl Drop for Connection {
+ mod test {
+     use anyhow::Result;
+     use indoc::indoc;
+    use std::{
+        fs,
+        sync::atomic::{AtomicUsize, Ordering},
+    };
+ 
+     use crate::connection::Connection;
+ 
+    static NEXT_NAMED_MEMORY_DB_ID: AtomicUsize = AtomicUsize::new(0);
+
+    fn unique_named_memory_db(prefix: &str) -> String {
+        format!(
+            "{prefix}_{}_{}",
+            std::process::id(),
+            NEXT_NAMED_MEMORY_DB_ID.fetch_add(1, Ordering::Relaxed)
+        )
+    }
+
+    fn literal_named_memory_paths(name: &str) -> [String; 3] {
+        let main = format!("file:{name}?mode=memory&cache=shared");
+        [main.clone(), format!("{main}-wal"), format!("{main}-shm")]
+    }
+
+    struct NamedMemoryPathGuard {
+        paths: [String; 3],
+    }
+
+    impl NamedMemoryPathGuard {
+        fn new(name: &str) -> Self {
+            let paths = literal_named_memory_paths(name);
+            for path in &paths {
+                let _ = fs::remove_file(path);
+            }
+            Self { paths }
+        }
+    }
+
+    impl Drop for NamedMemoryPathGuard {
+        fn drop(&mut self) {
+            for path in &self.paths {
+                let _ = fs::remove_file(path);
+            }
+        }
+    }
+
+     #[test]
+     fn string_round_trips() -> Result<()> {
+         let connection = Connection::open_memory(Some("string_round_trips"));
+@@ -382,6 +437,41 @@ mod test {
+         assert_eq!(read_blobs, vec![blob]);
+     }
+ 
+    #[test]
+    fn named_memory_connections_do_not_create_literal_backing_files() {
+        let name = unique_named_memory_db("named_memory_connections_do_not_create_backing_files");
+        let guard = NamedMemoryPathGuard::new(&name);
+
+        let connection1 = Connection::open_memory(Some(&name));
+        connection1
+            .exec(indoc! {"
+                CREATE TABLE shared (
+                    value INTEGER
+                )"})
+            .unwrap()()
+        .unwrap();
+        connection1
+            .exec("INSERT INTO shared (value) VALUES (7)")
+            .unwrap()()
+        .unwrap();
+
+        let connection2 = Connection::open_memory(Some(&name));
+        assert_eq!(
+            connection2
+                .select_row::<i64>("SELECT value FROM shared")
+                .unwrap()()
+            .unwrap(),
+            Some(7)
+        );
+
+        for path in &guard.paths {
+            assert!(
+                fs::metadata(path).is_err(),
+                "named in-memory database unexpectedly created backing file {path}"
+            );
+        }
+    }
+
+     #[test]
+     fn multi_step_statement_works() {
+         let connection = Connection::open_memory(Some("multi_step_statement_works"));
+diff --git a/crates/sqlez/src/thread_safe_connection.rs b/crates/sqlez/src/thread_safe_connection.rs
+index 966f14a9c2..9d868fcba4 100644
+--- a/crates/sqlez/src/thread_safe_connection.rs
+++ b/crates/sqlez/src/thread_safe_connection.rs
+@@ -7,12 +7,15 @@ use std::{
+     ops::Deref,
+     sync::{Arc, LazyLock},
+     thread,
+    time::Duration,
+ };
+ use thread_local::ThreadLocal;
+ 
+ use crate::{connection::Connection, domain::Migrator, util::UnboundedSyncSender};
+ 
+ const MIGRATION_RETRIES: usize = 10;
+const CONNECTION_INITIALIZE_RETRIES: usize = 50;
+const CONNECTION_INITIALIZE_RETRY_DELAY: Duration = Duration::from_millis(1);
+ 
+ type QueuedWrite = Box<dyn 'static + Send + FnOnce()>;
+ type WriteQueue = Box<dyn 'static + Send + Sync + Fn(QueuedWrite)>;
+@@ -197,21 +200,50 @@ impl ThreadSafeConnection {
+             Self::open_shared_memory(uri)
+         };
+ 
+        if let Some(initialize_query) = connection_initialize_query {
+            let mut last_error = None;
+            let initialized = (0..CONNECTION_INITIALIZE_RETRIES).any(|attempt| {
+                match connection.exec(initialize_query).and_then(|mut statement| statement()) {
+                    Ok(()) => true,
+                    Err(err)
+                        if is_schema_lock_error(&err)
+                            && attempt + 1 < CONNECTION_INITIALIZE_RETRIES =>
+                    {
+                        last_error = Some(err);
+                        thread::sleep(CONNECTION_INITIALIZE_RETRY_DELAY);
+                        false
+                    }
+                    Err(err) => {
+                        panic!(
+                            "Initialize query failed to execute: {}\n\nCaused by:\n{err:#}",
+                            initialize_query
+                        )
+                    }
+                }
+            });
+
+            if !initialized {
+                let err = last_error.expect("connection initialization retries should record the last error");
+                panic!(
+                    "Initialize query failed to execute after retries: {}\n\nCaused by:\n{err:#}",
+                    initialize_query
+                );
+            }
+        }
+
+         // Disallow writes on the connection. The only writes allowed for thread safe connections
+         // are from the background thread that can serialize them.
+         *connection.write.get_mut() = false;
+ 
+-        if let Some(initialize_query) = connection_initialize_query {
+-            connection.exec(initialize_query).unwrap_or_else(|_| {
+-                panic!("Initialize query failed to execute: {}", initialize_query)
+-            })()
+-            .unwrap()
+-        }
+-
+         connection
+     }
+ }
+ 
+fn is_schema_lock_error(err: &anyhow::Error) -> bool {
+    let message = format!("{err:#}");
+    message.contains("database schema is locked") || message.contains("database is locked")
+}
+
+ impl ThreadSafeConnection {
+     /// Special constructor for ThreadSafeConnection which disallows db initialization and migrations.
+     /// This allows construction to be infallible and not write to the db.
+@@ -282,7 +314,7 @@ mod test {
+     use indoc::indoc;
+     use std::ops::Deref;
+ 
+-    use std::thread;
+    use std::{thread, time::Duration};
+ 
+     use crate::{domain::Domain, thread_safe_connection::ThreadSafeConnection};
+ 
+@@ -318,38 +350,21 @@ mod test {
+     }
+ 
+     #[test]
+-    #[should_panic]
+-    fn wild_zed_lost_failure() {
+-        enum TestWorkspace {}
+-        impl Domain for TestWorkspace {
+-            const NAME: &str = "workspace";
+-
+-            const MIGRATIONS: &[&str] = &["
+-                    CREATE TABLE workspaces(
+-                        workspace_id INTEGER PRIMARY KEY,
+-                        dock_visible INTEGER, -- Boolean
+-                        dock_anchor TEXT, -- Enum: 'Bottom' / 'Right' / 'Expanded'
+-                        dock_pane INTEGER, -- NULL indicates that we don't have a dock pane yet
+-                        timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
+-                        FOREIGN KEY(dock_pane) REFERENCES panes(pane_id),
+-                        FOREIGN KEY(active_pane) REFERENCES panes(pane_id)
+-                    ) STRICT;
+-
+-                    CREATE TABLE panes(
+-                        pane_id INTEGER PRIMARY KEY,
+-                        workspace_id INTEGER NOT NULL,
+-                        active INTEGER NOT NULL, -- Boolean
+-                        FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
+-                            ON DELETE CASCADE
+-                            ON UPDATE CASCADE
+-                    ) STRICT;
+-                "];
+-        }
+    fn connection_initialize_query_retries_transient_schema_lock() {
+        let name = "connection_initialize_query_retries_transient_schema_lock";
+        let locking_connection = crate::connection::Connection::open_memory(Some(name));
+        locking_connection.exec("BEGIN IMMEDIATE").unwrap()().unwrap();
+        locking_connection
+            .exec("CREATE TABLE test(col TEXT)")
+            .unwrap()()
+            .unwrap();
+ 
+-        let builder =
+-            ThreadSafeConnection::builder::<TestWorkspace>("wild_zed_lost_failure", false)
+-                .with_connection_initialize_query("PRAGMA FOREIGN_KEYS=true");
+        let releaser = thread::spawn(move || {
+            thread::sleep(Duration::from_millis(10));
+            locking_connection.exec("ROLLBACK").unwrap()().unwrap();
+        });
+ 
+-        smol::block_on(builder.build()).unwrap();
+        ThreadSafeConnection::create_connection(false, name, Some("PRAGMA FOREIGN_KEYS=true"));
+        releaser.join().unwrap();
+     }
+ }
@@ -0,0 +1,328 @@
+From: Danny Milosavljevic <dannym@friendly-machines.com>
+Date: Fri, 6 Mar 2026 21:22:41 +0000
+Subject: [PATCH] db: Scope default test databases to the current test
+License: expat
+
+In test builds, the default database statics use fixed names such as
+`DB` and `KEY_VALUE_STORE`. That makes unrelated tests in the same test
+binary share the same named in-memory databases, which leaks state
+across tests and makes failures depend on execution order and
+concurrency.
+
+A first attempt at isolating those statics by thread is not sufficient:
+one test can legitimately use multiple threads, and splitting the test's
+workspace state across separate databases breaks parent-child foreign key
+relationships.
+
+Fix this by scoping the default test databases by the current test name
+instead. The `gpui::test` harness now installs the current test name on
+the executing thread, the test dispatcher propagates that scope to its
+realtime worker threads, and the default test statics resolve one shared
+database wrapper per test scope rather than per thread.
+
+That keeps sharing within a single test where it is intentional, while
+stopping hidden cross-test state leakage.
+
+diff --git a/crates/db/src/db.rs b/crates/db/src/db.rs
+index 36f0365af9..3ff8499c1d 100644
+--- a/crates/db/src/db.rs
+++ b/crates/db/src/db.rs
+@@ -19,6 +19,12 @@ use std::future::Future;
+ use std::path::Path;
+ use std::sync::atomic::AtomicBool;
+ use std::sync::{LazyLock, atomic::Ordering};
+#[cfg(any(test, feature = "test-support"))]
+use std::collections::HashMap;
+#[cfg(any(test, feature = "test-support"))]
+use std::sync::Mutex;
+#[cfg(any(test, feature = "test-support"))]
+use std::{borrow::Cow, ops::Deref};
+ use util::{ResultExt, maybe};
+ use zed_env_vars::ZED_STATELESS;
+ 
+@@ -97,7 +103,8 @@ async fn open_fallback_db<M: Migrator>() -> ThreadSafeConnection {
+ pub async fn open_test_db<M: Migrator>(db_name: &str) -> ThreadSafeConnection {
+     use sqlez::thread_safe_connection::locking_queue;
+ 
+-    ThreadSafeConnection::builder::<M>(db_name, false)
+    let db_name = scoped_test_db_name(db_name);
+    ThreadSafeConnection::builder::<M>(&db_name, false)
+         .with_db_initialization_query(DB_INITIALIZE_QUERY)
+         .with_connection_initialize_query(CONNECTION_INITIALIZE_QUERY)
+         // Serialize queued writes via a mutex and run them synchronously
+@@ -107,6 +114,69 @@ pub async fn open_test_db<M: Migrator>(db_name: &str) -> ThreadSafeConnection {
+         .unwrap()
+ }
+ 
+#[cfg(any(test, feature = "test-support"))]
+fn scoped_test_db_name(db_name: &str) -> Cow<'_, str> {
+    let Some(test_name) = current_test_scope_name() else {
+        return Cow::Borrowed(db_name);
+    };
+
+    let mut scoped_name = String::with_capacity(db_name.len() + test_name.len() + 2);
+    scoped_name.push_str(db_name);
+    scoped_name.push('@');
+    for ch in test_name.chars() {
+        if ch.is_ascii_alphanumeric() || matches!(ch, '-' | '_' | '.') {
+            scoped_name.push(ch);
+        } else {
+            scoped_name.push('_');
+        }
+    }
+
+    Cow::Owned(scoped_name)
+}
+
+#[cfg(any(test, feature = "test-support"))]
+fn current_test_scope_name() -> Option<String> {
+    if let Some(test_name) = gpui::current_test_name() {
+        return Some(test_name.to_string());
+    }
+
+    let current_thread = std::thread::current();
+    if let Some(test_name) = current_thread.name() {
+        return Some(test_name.to_string());
+    }
+
+    Some(format!("thread_{:?}", current_thread.id()))
+}
+
+#[cfg(any(test, feature = "test-support"))]
+pub struct TestScopedStatic<T: Send + Sync + 'static> {
+    initializer: fn() -> T,
+    values: Mutex<HashMap<String, &'static T>>,
+}
+
+#[cfg(any(test, feature = "test-support"))]
+impl<T: Send + Sync + 'static> TestScopedStatic<T> {
+    pub fn new(initializer: fn() -> T) -> Self {
+        Self {
+            initializer,
+            values: Mutex::new(HashMap::new()),
+        }
+    }
+}
+
+#[cfg(any(test, feature = "test-support"))]
+impl<T: Send + Sync + 'static> Deref for TestScopedStatic<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        let scope_name = current_test_scope_name().unwrap_or_else(|| "default".to_string());
+        let mut values = self.values.lock().unwrap();
+        *values
+            .entry(scope_name)
+            .or_insert_with(|| Box::leak(Box::new((self.initializer)())))
+    }
+}
+
+ /// Implements a basic DB wrapper for a given domain
+ ///
+ /// Arguments:
+@@ -126,16 +196,23 @@ macro_rules! static_connection {
+ 
+         impl $t {
+             #[cfg(any(test, feature = "test-support"))]
+-            pub async fn open_test_db(name: &'static str) -> Self {
+            pub async fn open_test_db(name: &str) -> Self {
+                 $t($crate::open_test_db::<$t>(name).await)
+             }
+         }
+ 
+         #[cfg(any(test, feature = "test-support"))]
+-        pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
+-            #[allow(unused_parens)]
+-            $t($crate::smol::block_on($crate::open_test_db::<($($d,)* $t)>(stringify!($id))))
+-        });
+        pub static $id: std::sync::LazyLock<$crate::TestScopedStatic<$t>> =
+            std::sync::LazyLock::new(|| {
+                fn initializer() -> $t {
+                    #[allow(unused_parens)]
+                    $t($crate::smol::block_on(
+                        $crate::open_test_db::<($($d,)* $t)>(stringify!($id))
+                    ))
+                }
+
+                $crate::TestScopedStatic::new(initializer)
+            });
+ 
+         #[cfg(not(any(test, feature = "test-support")))]
+         pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
+@@ -161,9 +238,10 @@ where
+ 
+ #[cfg(test)]
+ mod tests {
+    use anyhow::Result;
+     use std::thread;
+ 
+-    use sqlez::domain::Domain;
+    use sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection};
+     use sqlez_macros::sql;
+ 
+     use crate::open_db;
+@@ -295,4 +373,64 @@ mod tests {
+             assert!(guard.join().is_ok());
+         }
+     }
+
+    pub struct ScopedStaticDb(ThreadSafeConnection);
+
+    impl Domain for ScopedStaticDb {
+        const NAME: &str = "test_scoped_static_db";
+        const MIGRATIONS: &[&str] = &[sql!(
+            CREATE TABLE IF NOT EXISTS scoped_values(
+                value INTEGER NOT NULL
+            ) STRICT;
+        )];
+    }
+
+    crate::static_connection!(SCOPED_STATIC_DB, ScopedStaticDb, []);
+
+    impl ScopedStaticDb {
+        fn replace_value(&self, value: i64) -> Result<()> {
+            smol::block_on(self.write(move |connection| {
+                connection.exec("DELETE FROM scoped_values")?()?;
+                connection
+                    .exec_bound("INSERT INTO scoped_values(value) VALUES (?)")
+                    ?(value)?;
+                anyhow::Ok(())
+            }))
+        }
+
+        fn read_value(&self) -> Result<Option<i64>> {
+            self.select_row::<i64>("SELECT value FROM scoped_values").unwrap()()
+        }
+    }
+
+    #[test]
+    fn static_test_connections_are_scoped_by_test_name() {
+        gpui::with_test_name(Some("static_test_connections_are_scoped_by_test_name_a"), || {
+            assert_eq!(SCOPED_STATIC_DB.read_value().unwrap(), None);
+            SCOPED_STATIC_DB.replace_value(7).unwrap();
+            assert_eq!(SCOPED_STATIC_DB.read_value().unwrap(), Some(7));
+        });
+
+        gpui::with_test_name(Some("static_test_connections_are_scoped_by_test_name_b"), || {
+            assert_eq!(SCOPED_STATIC_DB.read_value().unwrap(), None);
+            SCOPED_STATIC_DB.replace_value(11).unwrap();
+            assert_eq!(SCOPED_STATIC_DB.read_value().unwrap(), Some(11));
+        });
+    }
+
+    #[test]
+    fn static_test_connections_share_state_across_threads_with_same_test_name() {
+        gpui::with_test_name(
+            Some("static_test_connections_share_state_across_threads_with_same_test_name"),
+            || {
+                SCOPED_STATIC_DB.replace_value(13).unwrap();
+
+                let test_name = gpui::current_test_name();
+                let thread = std::thread::spawn(move || {
+                    gpui::with_test_name(test_name, || SCOPED_STATIC_DB.read_value().unwrap())
+                });
+                assert_eq!(thread.join().unwrap(), Some(13));
+            },
+        );
+    }
+ }
+diff --git a/crates/gpui/src/platform/test/dispatcher.rs b/crates/gpui/src/platform/test/dispatcher.rs
+index fc3f7f253a..0d98b082ca 100644
+--- a/crates/gpui/src/platform/test/dispatcher.rs
+++ b/crates/gpui/src/platform/test/dispatcher.rs
+@@ -136,8 +136,9 @@ impl PlatformDispatcher for TestDispatcher {
+     }
+ 
+     fn spawn_realtime(&self, f: Box<dyn FnOnce() + Send>) {
+        let test_name = crate::current_test_name();
+         std::thread::spawn(move || {
+-            f();
+            crate::with_test_name(test_name, f);
+         });
+     }
+ }
+diff --git a/crates/gpui/src/test.rs b/crates/gpui/src/test.rs
+index 9f8fd8b198..469affdc1c 100644
+--- a/crates/gpui/src/test.rs
+++ b/crates/gpui/src/test.rs
+@@ -29,11 +29,44 @@ use crate::{Entity, Subscription, TestAppContext, TestDispatcher};
+ use futures::StreamExt as _;
+ use smol::channel;
+ use std::{
+    cell::Cell,
+     env,
+     panic::{self, RefUnwindSafe},
+     pin::Pin,
+ };
+ 
+thread_local! {
+    static CURRENT_TEST_NAME: Cell<Option<&'static str>> = const { Cell::new(None) };
+}
+
+/// Returns the test name currently associated with this thread, if any.
+pub fn current_test_name() -> Option<&'static str> {
+    CURRENT_TEST_NAME.with(Cell::get)
+}
+
+/// Runs the closure with the given test name installed for the current thread.
+pub fn with_test_name<R>(name: Option<&'static str>, f: impl FnOnce() -> R) -> R {
+    CURRENT_TEST_NAME.with(|current_name| {
+        struct RestoreTestName<'a> {
+            current_name: &'a Cell<Option<&'static str>>,
+            previous_name: Option<&'static str>,
+        }
+
+        impl Drop for RestoreTestName<'_> {
+            fn drop(&mut self) {
+                self.current_name.set(self.previous_name);
+            }
+        }
+
+        let previous_name = current_name.replace(name);
+        let _restore = RestoreTestName {
+            current_name,
+            previous_name,
+        };
+        f()
+    })
+}
+
+ /// Run the given test function with the configured parameters.
+ /// This is intended for use with the `gpui::test` macro
+ /// and generally should not be used directly.
+diff --git a/crates/gpui_macros/src/test.rs b/crates/gpui_macros/src/test.rs
+index 490ea07fee..3abcaad3ae 100644
+--- a/crates/gpui_macros/src/test.rs
+++ b/crates/gpui_macros/src/test.rs
+@@ -191,10 +191,12 @@ fn generate_test_function(
+                     &[#seeds],
+                     #max_retries,
+                     &mut |dispatcher, _seed| {
+-                        let foreground_executor = gpui::ForegroundExecutor::new(std::sync::Arc::new(dispatcher.clone()));
+-                        #cx_vars
+-                        foreground_executor.block_test(#inner_fn_name(#inner_fn_args));
+-                        #cx_teardowns
+                        gpui::with_test_name(Some(stringify!(#outer_fn_name)), || {
+                            let foreground_executor = gpui::ForegroundExecutor::new(std::sync::Arc::new(dispatcher.clone()));
+                            #cx_vars
+                            foreground_executor.block_test(#inner_fn_name(#inner_fn_args));
+                            #cx_teardowns
+                        })
+                     },
+                     #on_failure_fn_name
+                 );
+@@ -274,9 +276,11 @@ fn generate_test_function(
+                     &[#seeds],
+                     #max_retries,
+                     &mut |dispatcher, _seed| {
+-                        #cx_vars
+-                        #inner_fn_name(#inner_fn_args);
+-                        #cx_teardowns
+                        gpui::with_test_name(Some(stringify!(#outer_fn_name)), || {
+                            #cx_vars
+                            #inner_fn_name(#inner_fn_args);
+                            #cx_teardowns
+                        })
+                     },
+                     #on_failure_fn_name,
+                 );
@@ -0,0 +1,310 @@
+Author: Danny Milosavljevic <dannym@friendly-machines.com>
+Subject: Fix workspace persistence races during restoration.
+Date: 2026-03-01
+License: expat
+
+In 0.225.10, workspace persistence has three separate ordering problems.
+
+First, newly allocated workspace IDs could be used for item persistence before a
+parent row had been inserted into the workspaces table. That made editor
+persistence race with workspace creation and could fail with a foreign key
+constraint error.
+
+Second, workspace layout persistence and per-item persistence run on separate
+asynchronous paths. That allowed the workspace layout to be saved with item IDs
+before the background item-serialization worker had finished writing the
+corresponding per-item rows. On restore, deserializers that require persisted
+item state could then fail with "No entry in database for item_id ...", which
+could drop restored state and break restoration features that depend on that
+persisted item state, including edited-window restoration.
+
+Third, restore-side cleanup assumed that deserialized items had already been
+saved under their new runtime item IDs after being added to panes. In reality,
+adding a deserialized item only enqueues that serialization work. Cleanup could
+therefore delete the old persisted rows before the new rows existed, leaving the
+next reopen with a pane/item layout that still referenced state that had just
+been deleted.
+
+This change fixes all three issues:
+
+- eagerly create the parent workspaces row as soon as a new workspace ID is
+  allocated, before any item serializer can write child rows
+- keep item persistence on the existing serialization queue, but add an
+  ordering barrier before saving workspace layout so the layout is never
+  published ahead of the item state it references
+- during restore, wait for the queued serialization of newly added
+  deserialized items before cleaning up stale persisted item IDs, and skip
+  that cleanup pass if the barrier cannot be established or awaited so stale
+  rows are kept rather than deleting still-needed state
+
+See also <https://github.com/zed-industries/zed/pull/50873>.
+
+diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
+index e0ad046e8d..aeb4c3ba39 100644
+--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
+@@ -2124,6 +2124,13 @@ impl WorkspaceDb {
+         }
+     }
+ 
+    query! {
+        pub(crate) async fn ensure_workspace_row(workspace_id: WorkspaceId) -> Result<()> {
+            INSERT OR IGNORE INTO workspaces(workspace_id)
+            VALUES (?1)
+        }
+    }
+
+     query! {
+         pub(crate) async fn set_window_open_status(workspace_id: WorkspaceId, bounds: SerializedWindowBounds, display: Uuid) -> Result<()> {
+             UPDATE workspaces
+diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
+index 4141952cc7..3ea631ed6f 100644
+--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
+@@ -1175,6 +1175,11 @@ enum WorkspaceLocation {
+     None,
+ }
+ 
+enum SerializableItemMessage {
+    Item(Box<dyn SerializableItemHandle>),
+    Barrier(oneshot::Sender<()>),
+}
+
+ type PromptForNewPath = Box<
+     dyn Fn(
+         &mut Workspace,
+@@ -1253,7 +1258,7 @@ pub struct Workspace {
+     on_prompt_for_open_path: Option<PromptForOpenPath>,
+     terminal_provider: Option<Box<dyn TerminalProvider>>,
+     debugger_provider: Option<Arc<dyn DebuggerProvider>>,
+-    serializable_items_tx: UnboundedSender<Box<dyn SerializableItemHandle>>,
+    serializable_items_tx: UnboundedSender<SerializableItemMessage>,
+     _items_serializer: Task<Result<()>>,
+     session_id: Option<String>,
+     scheduled_tasks: Vec<Task<()>>,
+@@ -1554,7 +1559,7 @@ impl Workspace {
+         }
+ 
+         let (serializable_items_tx, serializable_items_rx) =
+-            mpsc::unbounded::<Box<dyn SerializableItemHandle>>();
+            mpsc::unbounded::<SerializableItemMessage>();
+         let _items_serializer = cx.spawn_in(window, async move |this, cx| {
+             Self::serialize_items(&this, serializable_items_rx, cx).await
+         });
+@@ -1759,6 +1764,7 @@ impl Workspace {
+             } else {
+                 DB.next_id().await.unwrap_or_else(|_| Default::default())
+             };
+            DB.ensure_workspace_row(workspace_id).await?;
+ 
+             let toolchains = DB.toolchains(workspace_id).await?;
+ 
+@@ -6036,8 +6042,16 @@ impl Workspace {
+                     window_id: Some(window.window_handle().window_id().as_u64()),
+                     user_toolchains,
+                 };
+                let item_serialization_barrier = self.item_serialization_barrier();
+ 
+                 window.spawn(cx, async move |_| {
+                    let Some(item_serialization_barrier) = item_serialization_barrier.log_err()
+                    else {
+                        return;
+                    };
+                    if item_serialization_barrier.await.log_err().is_none() {
+                        return;
+                    }
+                     persistence::DB.save_workspace(serialized_workspace).await;
+                 })
+             }
+@@ -6108,31 +6122,49 @@ impl Workspace {
+ 
+     async fn serialize_items(
+         this: &WeakEntity<Self>,
+-        items_rx: UnboundedReceiver<Box<dyn SerializableItemHandle>>,
+        mut items_rx: UnboundedReceiver<SerializableItemMessage>,
+         cx: &mut AsyncWindowContext,
+     ) -> Result<()> {
+         const CHUNK_SIZE: usize = 200;
+ 
+-        let mut serializable_items = items_rx.ready_chunks(CHUNK_SIZE);
+        while let Some(message) = items_rx.next().await {
+            let mut unique_items = HashMap::default();
+            let mut barrier = None;
+            let mut channel_closed = false;
+ 
+-        while let Some(items_received) = serializable_items.next().await {
+-            let unique_items =
+-                items_received
+-                    .into_iter()
+-                    .fold(HashMap::default(), |mut acc, item| {
+-                        acc.entry(item.item_id()).or_insert(item);
+-                        acc
+-                    });
+            Self::push_serializable_item_message(message, &mut unique_items, &mut barrier);
+ 
+-            // We use into_iter() here so that the references to the items are moved into
+-            // the tasks and not kept alive while we're sleeping.
+-            for (_, item) in unique_items.into_iter() {
+-                if let Ok(Some(task)) = this.update_in(cx, |workspace, window, cx| {
+-                    item.serialize(workspace, false, window, cx)
+-                }) {
+-                    cx.background_spawn(async move { task.await.log_err() })
+-                        .detach();
+            while barrier.is_none() && unique_items.len() < CHUNK_SIZE {
+                match items_rx.try_next() {
+                    Ok(Some(message)) => {
+                        Self::push_serializable_item_message(
+                            message,
+                            &mut unique_items,
+                            &mut barrier,
+                        );
+                    }
+                    Ok(None) => {
+                        channel_closed = true;
+                        break;
+                    }
+                    Err(_) => break,
+                }
+            }
+
+            let batch_succeeded = Self::serialize_item_batch(this, unique_items, cx)
+                .await
+                .log_err()
+                .is_some();
+
+            if let Some(barrier) = barrier {
+                if batch_succeeded {
+                    let _ = barrier.send(());
+                 }
+                continue;
+            }
+
+            if channel_closed {
+                break;
+             }
+ 
+             cx.background_executor()
+@@ -6143,12 +6175,54 @@ impl Workspace {
+         Ok(())
+     }
+ 
+    fn push_serializable_item_message(
+        message: SerializableItemMessage,
+        unique_items: &mut HashMap<EntityId, Box<dyn SerializableItemHandle>>,
+        barrier: &mut Option<oneshot::Sender<()>>,
+    ) {
+        match message {
+            SerializableItemMessage::Item(item) => {
+                unique_items.entry(item.item_id()).or_insert(item);
+            }
+            SerializableItemMessage::Barrier(sender) => {
+                *barrier = Some(sender);
+            }
+        }
+    }
+
+    async fn serialize_item_batch(
+        this: &WeakEntity<Self>,
+        unique_items: HashMap<EntityId, Box<dyn SerializableItemHandle>>,
+        cx: &mut AsyncWindowContext,
+    ) -> Result<()> {
+        let serialize_tasks = match this.update_in(cx, move |workspace, window, cx| {
+            unique_items
+                .into_values()
+                .filter_map(|item| item.serialize(workspace, false, window, cx))
+                .collect::<Vec<_>>()
+        }) {
+            Ok(serialize_tasks) => serialize_tasks,
+            Err(_) => return Ok(()),
+        };
+
+        try_join_all(serialize_tasks).await?;
+        Ok(())
+    }
+
+    fn item_serialization_barrier(&self) -> Result<oneshot::Receiver<()>> {
+        let (sender, receiver) = oneshot::channel();
+        self.serializable_items_tx
+            .unbounded_send(SerializableItemMessage::Barrier(sender))
+            .map_err(|err| anyhow!("failed to send item serialization barrier: {err}"))?;
+        Ok(receiver)
+    }
+
+     pub(crate) fn enqueue_item_serialization(
+         &mut self,
+         item: Box<dyn SerializableItemHandle>,
+     ) -> Result<()> {
+         self.serializable_items_tx
+-            .unbounded_send(item)
+            .unbounded_send(SerializableItemMessage::Item(item))
+             .map_err(|err| anyhow!("failed to send serializable item over channel: {err}"))
+     }
+ 
+@@ -6252,24 +6326,42 @@ impl Workspace {
+             // after loading the items, we might have different items and in order to avoid
+             // the database filling up, we delete items that haven't been loaded now.
+             //
+-            // The items that have been loaded, have been saved after they've been added to the workspace.
+-            let clean_up_tasks = workspace.update_in(cx, |_, window, cx| {
+-                item_ids_by_kind
+-                    .into_iter()
+-                    .map(|(item_kind, loaded_items)| {
+-                        SerializableItemRegistry::cleanup(
+-                            item_kind,
+-                            serialized_workspace.id,
+-                            loaded_items,
+-                            window,
+-                            cx,
+-                        )
+-                        .log_err()
+-                    })
+-                    .collect::<Vec<_>>()
+-            })?;
+            // Newly deserialized items only enqueue serialization when they are added to their panes.
+            // Wait for that queued work to finish before deleting the old persisted item ids.
+            let item_serialization_barrier = workspace
+                .update_in(cx, |workspace, _, _| {
+                    workspace.item_serialization_barrier().log_err()
+                })
+                .log_err()
+                .flatten();
+
+            let item_serialization_flushed = if let Some(item_serialization_barrier) =
+                item_serialization_barrier
+            {
+                item_serialization_barrier.await.log_err().is_some()
+            } else {
+                false
+            };
+ 
+-            futures::future::join_all(clean_up_tasks).await;
+            if item_serialization_flushed {
+                let clean_up_tasks = workspace.update_in(cx, |_, window, cx| {
+                    item_ids_by_kind
+                        .into_iter()
+                        .map(|(item_kind, loaded_items)| {
+                            SerializableItemRegistry::cleanup(
+                                item_kind,
+                                serialized_workspace.id,
+                                loaded_items,
+                                window,
+                                cx,
+                            )
+                            .log_err()
+                        })
+                        .collect::<Vec<_>>()
+                })?;
+
+                futures::future::join_all(clean_up_tasks).await;
+            }
+ 
+             workspace
+                 .update_in(cx, |workspace, window, cx| {
+@@ -9001,6 +9093,7 @@ fn deserialize_remote_project(
+         } else {
+             persistence::DB.next_id().await?
+         };
+        persistence::DB.ensure_workspace_row(workspace_id).await?;
+ 
+         Ok((workspace_id, serialized_workspace))
+     })
@@ -0,0 +1,163 @@
+From: Danny Milosavljevic <dannym@friendly-machines.com>
+Date: Fri, 6 Mar 2026 20:20:00 +0000
+Subject: [PATCH] workspace: Keep local workspaces whose roots are only regular files
+License: expat
+
+Zed persists local workspaces for standalone regular files as well as
+directory-backed projects. Recent-workspace cleanup and last-session
+restoration were using a helper that only kept local workspaces if all
+saved paths existed and at least one of them was a directory.
+
+That made local workspaces whose roots were only regular files look
+invalid. A background recent-workspaces pass could then delete the
+workspace row, which in turn cascaded to item-specific state such as
+editors. In the window edited-state restore test, reopening a
+standalone regular file could therefore fail because the saved editor
+row had been deleted by that cleanup path.
+
+Fix this by treating a local workspace as valid whenever all of its
+saved paths still exist, whether those paths are directories or
+regular files. Apply the same rule to last-session workspace
+restoration, and add regression coverage for both code paths.
+
+diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
+--- a/crates/workspace/src/persistence.rs
+++ b/crates/workspace/src/persistence.rs
+@@ -1783,19 +1783,13 @@ impl WorkspaceDb {
+         }
+     }
+ 
+-    async fn all_paths_exist_with_a_directory(paths: &[PathBuf], fs: &dyn Fs) -> bool {
+-        let mut any_dir = false;
+    async fn all_paths_exist(paths: &[PathBuf], fs: &dyn Fs) -> bool {
+         for path in paths {
+-            match fs.metadata(path).await.ok().flatten() {
+-                None => return false,
+-                Some(meta) => {
+-                    if meta.is_dir {
+-                        any_dir = true;
+-                    }
+-                }
+            if fs.metadata(path).await.ok().flatten().is_none() {
+                return false;
+             }
+         }
+-        any_dir
+        true
+     }
+ 
+     // Returns the recent locations which are still valid on disk and deletes ones which no longer
+@@ -1843,7 +1837,11 @@ impl WorkspaceDb {
+             // If a local workspace points to WSL, this check will cause us to wait for the
+             // WSL VM and file server to boot up. This can block for many seconds.
+             // Supported scenarios use remote workspaces.
+-            if !has_wsl_path && Self::all_paths_exist_with_a_directory(paths.paths(), fs).await {
+            //
+            // Local workspaces may legitimately contain only regular files (for example, a
+            // standalone file opened outside any worktree). Those should be preserved as
+            // long as all of their saved paths still exist.
+            if !has_wsl_path && Self::all_paths_exist(paths.paths(), fs).await {
+                 result.push((id, SerializedWorkspaceLocation::Local, paths, timestamp));
+             } else {
+                 delete_tasks.push(self.delete_workspace_by_id(id));
+@@ -1903,7 +1901,7 @@ impl WorkspaceDb {
+                     window_id,
+                 });
+             } else {
+-                if Self::all_paths_exist_with_a_directory(paths.paths(), fs).await {
+                if Self::all_paths_exist(paths.paths(), fs).await {
+                     workspaces.push(SessionWorkspace {
+                         workspace_id,
+                         location: SerializedWorkspaceLocation::Local,
+@@ -3425,6 +3423,91 @@ mod tests {
+         );
+     }
+ 
+    #[gpui::test]
+    async fn test_recent_workspaces_on_disk_keeps_regular_file_only_workspace(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let dir = tempfile::TempDir::with_prefix("regular-file-workspace").unwrap();
+        let regular_file = dir.path().join("a");
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(dir.path(), json!({"a": "hey"})).await;
+
+        let db = WorkspaceDb::open_test_db("test_recent_workspaces_keeps_regular_file_only")
+            .await;
+        let workspace = SerializedWorkspace {
+            id: WorkspaceId(1),
+            paths: PathList::new(&[regular_file.clone()]),
+            location: SerializedWorkspaceLocation::Local,
+            center_group: Default::default(),
+            window_bounds: Default::default(),
+            display: Default::default(),
+            docks: Default::default(),
+            centered_layout: false,
+            breakpoints: Default::default(),
+            session_id: None,
+            window_id: Some(1),
+            user_toolchains: Default::default(),
+        };
+
+        db.save_workspace(workspace.clone()).await;
+
+        let recent = db.recent_workspaces_on_disk(fs.as_ref()).await.unwrap();
+        assert_eq!(
+            recent,
+            vec![(
+                workspace.id,
+                SerializedWorkspaceLocation::Local,
+                workspace.paths.clone(),
+                recent[0].3,
+            )]
+        );
+        assert_eq!(db.workspace_for_roots(&[regular_file]).unwrap().id, workspace.id);
+    }
+
+    #[gpui::test]
+    async fn test_last_session_workspace_locations_keeps_regular_file_only_workspace(
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let dir = tempfile::TempDir::with_prefix("regular-file-workspace-session").unwrap();
+        let regular_file = dir.path().join("a");
+
+        let fs = fs::FakeFs::new(cx.executor());
+        fs.insert_tree(dir.path(), json!({"a": "hey"})).await;
+
+        let db = WorkspaceDb::open_test_db("test_last_session_keeps_regular_file_only").await;
+        let workspace = SerializedWorkspace {
+            id: WorkspaceId(1),
+            paths: PathList::new(&[regular_file.clone()]),
+            location: SerializedWorkspaceLocation::Local,
+            center_group: Default::default(),
+            window_bounds: Default::default(),
+            display: Default::default(),
+            docks: Default::default(),
+            centered_layout: false,
+            breakpoints: Default::default(),
+            session_id: Some("one-session".to_owned()),
+            window_id: Some(7),
+            user_toolchains: Default::default(),
+        };
+
+        db.save_workspace(workspace.clone()).await;
+
+        let locations = db
+            .last_session_workspace_locations("one-session", None, fs.as_ref())
+            .await
+            .unwrap();
+        assert_eq!(
+            locations,
+            vec![SessionWorkspace {
+                workspace_id: workspace.id,
+                location: SerializedWorkspaceLocation::Local,
+                paths: workspace.paths,
+                window_id: Some(WindowId::from(7u64)),
+            }]
+        );
+    }
+
+     #[gpui::test]
+     async fn test_get_or_create_ssh_project() {
+         let db = WorkspaceDb::open_test_db("test_get_or_create_ssh_project").await;
@@ -0,0 +1,24 @@
+Author: Danny Milosavljevic <dannym@friendly-machines.com>
+Subject: Remove the [patch.crates-io] section from Cargo.toml.
+Date: 2026-03-01
+License: expat
+
+These overrides redirect crates-io dependencies to git sources, which cannot be
+fetched in an offline build.  With vendored sources the overrides are unnecessary.
+
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -804,13 +804,6 @@
+     "Win32_Media",
+ ]
+
+-[patch.crates-io]
+-async-task = { git = "https://github.com/smol-rs/async-task.git", rev = "b4486cd71e4e94fbda54ce6302444de14f4d190e" }
+-notify = { git = "https://github.com/zed-industries/notify.git", rev = "ce58c24cad542c28e04ced02e20325a4ec28a31d" }
+-notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "ce58c24cad542c28e04ced02e20325a4ec28a31d" }
+-windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" }
+-calloop = { git = "https://github.com/zed-industries/calloop" }
+-
+ [profile.dev]
+ split-debuginfo = "unpacked"
+ incremental = true
@@ -0,0 +1,75 @@
+Author: Danny Milosavljevic <dannym@friendly-machines.com>
+Subject: Use mock livekit client on Linux to avoid libwebrtc dependency.
+Date: 2026-03-01
+License: GPL3+
+
+libwebrtc is not packaged in Guix and is difficult to build from source.
+Zed already has a mock_client fallback for FreeBSD and Windows-GNU which
+lack libwebrtc.  Add target_os = "linux" to those cfg conditions so Linux
+also uses mock_client, and exclude the libwebrtc/livekit dependencies from
+Cargo.toml on Linux.  This disables voice/video calls but allows the rest
+of Zed to build.
+
+--- a/crates/livekit_client/Cargo.toml	2026-03-01 21:21:38.647599342 +0000
+++ b/crates/livekit_client/Cargo.toml	2026-03-01 21:22:19.846482866 +0000
+@@ -44,7 +44,7 @@
+ ui.workspace = true
+ util.workspace = true
+ 
+-[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
+[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd", target_os = "linux")))'.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"] }
+ 
+--- a/crates/livekit_client/src/lib.rs	2026-03-01 21:21:44.752291052 +0000
+++ b/crates/livekit_client/src/lib.rs	2026-03-01 21:22:37.234363786 +0000
+@@ -15,7 +15,8 @@
+         test,
+         feature = "test-support",
+         all(target_os = "windows", target_env = "gnu"),
+-        target_os = "freebsd"
+        target_os = "freebsd",
+        target_os = "linux"
+     ))
+ ))]
+ mod livekit_client;
+@@ -25,7 +26,8 @@
+         test,
+         feature = "test-support",
+         all(target_os = "windows", target_env = "gnu"),
+-        target_os = "freebsd"
+        target_os = "freebsd",
+        target_os = "linux"
+     ))
+ ))]
+ pub use livekit_client::*;
+@@ -36,7 +38,8 @@
+         test,
+         feature = "test-support",
+         all(target_os = "windows", target_env = "gnu"),
+-        target_os = "freebsd"
+        target_os = "freebsd",
+        target_os = "linux"
+     )
+ ))]
+ mod mock_client;
+@@ -46,7 +49,8 @@
+         test,
+         feature = "test-support",
+         all(target_os = "windows", target_env = "gnu"),
+-        target_os = "freebsd"
+        target_os = "freebsd",
+        target_os = "linux"
+     )
+ ))]
+ pub mod test;
+@@ -56,7 +60,8 @@
+         test,
+         feature = "test-support",
+         all(target_os = "windows", target_env = "gnu"),
+-        target_os = "freebsd"
+        target_os = "freebsd",
+        target_os = "linux"
+     )
+ ))]
+ pub use mock_client::*;
@@ -4,7 +4,7 @@
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2021, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
-;;; Copyright © 2024-2025 jgart <jgart@dismail.de>
+;;; Copyright © 2024-2026 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,6 +39,7 @@
  #:use-module (gnu packages fontutils)
  #:use-module (gnu packages game-development)
  #:use-module (gnu packages image)
+  #:use-module (gnu packages libedit)
  #:use-module (gnu packages libffi)
  #:use-module (gnu packages libunwind)
  #:use-module (gnu packages maths)
@@ -236,7 +237,7 @@ it.")
 (define-public trealla
  (package
    (name "trealla")
-    (version "2.92.29")
+    (version "2.92.30")
    (source
     (origin
       (method git-fetch)
@@ -245,12 +246,13 @@ it.")
          (url "https://github.com/trealla-prolog/trealla")
          (commit (string-append "v" version))))
       (sha256
-        (base32 "1032pza07dzyrsjrbh355h3cyrkwsg2vbzwwaaxcvfirjhn8zdam"))
+        (base32 "1vbjv2nf3c2npf349i9y0zknc2g0hizksv0yhgscdpwzvzfp6n9m"))
       (file-name (git-file-name name version))))
    (build-system gnu-build-system)
    (inputs
     (list curl
           gsl
+           libedit
           libffi
           openssl
           raylib
@@ -59,6 +59,128 @@
       (base32
        "1yhs9lj9gnzbvimv0y5f1a4my0slbvygkcjjkaxd4wkkyfvfbkxy")))))

+;; Workspace dependency of zed.
+;;
+;; Cargo side: Cargo unifies dependency versions across zed's
+;; workspace, including this package's transitive dependencies,
+;; and records them in zed's Cargo.lock.
+;;
+;; Guix side: zed's cargo-inputs entry (generated from zed's
+;; Cargo.lock) already contains all of this package's transitive
+;; dependencies, so this package reuses zed's cargo-inputs.
+(define-public rust-alacritty-0.25.1.9d9640d
+  (hidden-package
+   (package
+     (name "rust-alacritty")
+     (version "0.25.1")
+     (source
+      (origin
+        (method git-fetch)
+        (uri
+         (git-reference
+          (url "https://github.com/zed-industries/alacritty")
+          (commit "9d9640d4e56d67a09d049f9c0a300aae08d4f61e")))
+        (file-name
+         (git-file-name "rust-alacritty" "0.25.1.9d9640d"))
+        (sha256
+         (base32 "16g4jdbwdhqihc2x403fdaxf6m9gcj44cm53dyk68b3wl7chh29s"))))
+     (build-system cargo-build-system)
+     (arguments
+      (list #:skip-build? #t
+            #:install-source? #t
+            #:cargo-package-crates ''("alacritty_terminal")
+            #:cargo-package-flags ''("--no-metadata" "--no-verify"
+                                     "--exclude-lockfile")))
+     (inputs (cargo-inputs 'rust-alacritty-0.25.1.9d9640d))
+     (home-page "https://github.com/zed-industries/alacritty")
+     (synopsis "Terminal emulator library")
+     (description
+      "This package provides a terminal emulator library.")
+     (license license:asl2.0))))
+
+;; Workspace dependency of zed.
+;;
+;; Cargo side: Cargo unifies dependency versions across zed's
+;; workspace, including this package's transitive dependencies,
+;; and records them in zed's Cargo.lock.
+;;
+;; Guix side: zed's cargo-inputs entry (generated from zed's
+;; Cargo.lock) already contains all of this package's transitive
+;; dependencies, so this package reuses zed's cargo-inputs.
+(define-public rust-candle-0.9.1.724d75e
+  (hidden-package
+   (package
+     (name "rust-candle")
+     (version "0.9.1")
+     (source
+      (origin
+        (method git-fetch)
+        (uri
+         (git-reference
+          (url "https://github.com/zed-industries/candle")
+          (commit "724d75eb3deebefe83f2a7381a45d4fac6eda383")))
+        (file-name
+         (git-file-name "rust-candle" "0.9.1.724d75e"))
+        (sha256
+         (base32 "1n9g84g0ikldw42f0j3ad975vjvx6ildwqh8dw3zi3rps518hx14"))
+        (patches
+         (search-patches
+          "rust-candle-0.9.1-add-candle-onnx-to-workspace.patch"))))
+     (build-system cargo-build-system)
+     (arguments
+      (list #:skip-build? #t
+            #:install-source? #t
+            #:cargo-package-crates ''("candle-core"
+                                      "candle-nn"
+                                      "candle-onnx")
+            #:cargo-package-flags ''("--no-metadata" "--no-verify"
+                                     "--exclude-lockfile")))
+     (inputs (cargo-inputs 'rust-candle-0.9.1.724d75e))
+     (home-page "https://github.com/huggingface/candle")
+     (synopsis "Minimalist ML framework for Rust")
+     (description
+      "This package provides a minimalist ML framework for Rust.")
+     (license (list license:asl2.0 license:expat)))))
+
+;; Workspace dependency of zed.
+;;
+;; Cargo side: Cargo unifies dependency versions across zed's
+;; workspace, including this package's transitive dependencies,
+;; and records them in zed's Cargo.lock.
+;;
+;; Guix side: zed's cargo-inputs entry (generated from zed's
+;; Cargo.lock) already contains all of this package's transitive
+;; dependencies, so this package reuses zed's cargo-inputs.
+(define-public rust-dap-types-0.0.1.1b461b3
+  (hidden-package
+   (package
+     (name "rust-dap-types")
+     (version "0.0.1")
+     (source
+      (origin
+        (method git-fetch)
+        (uri
+         (git-reference
+          (url "https://github.com/zed-industries/dap-types")
+          (commit "1b461b310481d01e02b2603c16d7144b926339f8")))
+        (file-name
+         (git-file-name "rust-dap-types" "0.0.1.1b461b3"))
+        (sha256
+         (base32 "0snc05ia4jvykajavsvyxcyn24s2jxbw7k9wmby23r1aqxf31i0z"))))
+     (build-system cargo-build-system)
+     (arguments
+      (list #:skip-build? #t
+            #:install-source? #t
+            #:cargo-package-crates ''("dap-types")
+            #:cargo-package-flags ''("--no-metadata" "--no-verify"
+                                     "--exclude-lockfile")))
+     (inputs (cargo-inputs 'rust-dap-types-0.0.1.1b461b3))
+     (home-page "https://github.com/zed-industries/dap-types")
+     (synopsis "Rust types for the Debug Adapter Protocol")
+     (description
+      "This package provides Rust types for the Debug Adapter Protocol.")
+     (license (list license:asl2.0 license:expat)))))
+
 (define-public rust-deunicode-1
  (hidden-package
   (package
@@ -102,6 +224,46 @@
 transliterating them.  It supports Emoji and Chinese.")
     (license license:bsd-3))))

+;; Workspace dependency of zed.
+;;
+;; Cargo side: Cargo unifies dependency versions across zed's
+;; workspace, including this package's transitive dependencies,
+;; and records them in zed's Cargo.lock.
+;;
+;; Guix side: zed's cargo-inputs entry (generated from zed's
+;; Cargo.lock) already contains all of this package's transitive
+;; dependencies, so this package reuses zed's cargo-inputs.
+(define-public rust-gh-workflow-0.8.0.c9eac0e
+  (hidden-package
+   (package
+     (name "rust-gh-workflow")
+     (version "0.8.0")
+     (source
+      (origin
+        (method git-fetch)
+        (uri
+         (git-reference
+          (url "https://github.com/zed-industries/gh-workflow")
+          (commit "c9eac0ed361583e1072860d96776fa52775b82ac")))
+        (file-name
+         (git-file-name "rust-gh-workflow" "0.8.0.c9eac0e"))
+        (sha256
+         (base32 "172bn9b16f7qj3mn0h8r8bwiiiw2awgqlzj5n6f2gjcgk5nmh1hp"))))
+     (build-system cargo-build-system)
+     (arguments
+      (list #:skip-build? #t
+            #:install-source? #t
+            #:cargo-package-crates ''("gh-workflow-macros"
+                                      "gh-workflow")
+            #:cargo-package-flags ''("--no-metadata" "--no-verify"
+                                     "--exclude-lockfile")))
+     (inputs (cargo-inputs 'rust-gh-workflow-0.8.0.c9eac0e))
+     (home-page "https://github.com/tailcallhq/gh-workflow")
+     (synopsis "Type-safe GitHub Actions workflow generation")
+     (description
+      "This package provides type-safe GitHub Actions workflow generation.")
+     (license license:expat))))
+
 (define-public rust-hypher-0.1
  (hidden-package
   (package
@@ -145,6 +307,191 @@ transliterating them.  It supports Emoji and Chinese.")
     (description "@code{hypher} is a Rust library for syllabification.")
     (license (list license:expat license:asl2.0)))))

+;; Workspace dependency of zed.
+;;
+;; Cargo side: Cargo unifies dependency versions across zed's
+;; workspace, including this package's transitive dependencies,
+;; and records them in zed's Cargo.lock.
+;;
+;; Guix side: zed's cargo-inputs entry (generated from zed's
+;; Cargo.lock) already contains all of this package's transitive
+;; dependencies, so this package reuses zed's cargo-inputs.
+;;
+;; Only livekit-protocol, livekit-runtime, and livekit-api are
+;; packaged.  The libwebrtc, webrtc-sys, and livekit crates are
+;; disabled on Linux by our zed-use-mock-livekit-on-linux patch
+;; (which adds target_os = "linux" to the cfg gate), but their
+;; Cargo.toml files must remain for workspace resolution; their
+;; source is replaced with empty stubs.  The snippet also deletes
+;; unused workspace members (livekit-ffi, soxr-sys, yuv-sys,
+;; imgproc, examples) and the 1.6 MiB generated livekit.serde.rs
+;; (guarded by a nonexistent "serde" feature, so never compiled).
+;;
+;; TODO: Regenerate livekit-protocol/src/livekit.rs (5650 lines)
+;; from the .proto source in the livekit-protocol/protocol
+;; submodule (github.com/livekit/protocol) using prost-build and
+;; pbjson-build as native-inputs, then delete the shipped copy.
+(define-public rust-livekit-0.7.8.5f04705
+  (hidden-package
+   (package
+     (name "rust-livekit")
+     (version "0.7.8")
+     (source
+      (origin
+        (method git-fetch)
+        (uri
+         (git-reference
+          (url "https://github.com/zed-industries/livekit-rust-sdks")
+          (commit "5f04705ac3f356350ae31534ffbc476abc9ea83d")))
+        (file-name
+         (git-file-name "rust-livekit" "0.7.8.5f04705"))
+        (sha256
+         (base32 "1irnw9dax0nl8rl7jxdxs5vw6hg166jj4gf1s5cza6igvmrkl6y9"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin
+            (for-each delete-file-recursively
+                      '(".github" "examples" "imgproc"
+                        "livekit-ffi" "soxr-sys" "yuv-sys"
+                        ;; Keep Cargo.toml for workspace resolution
+                        ;; but replace source with stubs.
+                        "libwebrtc/src"
+                        "livekit/src"
+                        "webrtc-sys/src"
+                        "webrtc-sys/include"
+                        "webrtc-sys/libwebrtc"))
+            (for-each (lambda (f)
+                        (mkdir-p (dirname f))
+                        (call-with-output-file f (const #t)))
+                      '("libwebrtc/src/lib.rs"
+                        "livekit/src/lib.rs"
+                        "webrtc-sys/src/lib.rs"))
+            (delete-file
+             "livekit-protocol/src/livekit.serde.rs")
+            (substitute* "Cargo.toml"
+              (("\"livekit-ffi\",") "")
+              (("\"soxr-sys\",") "")
+              (("\"yuv-sys\",") "")
+              (("\"imgproc\",") ""))))))
+     (build-system cargo-build-system)
+     (arguments
+      (list #:skip-build? #t
+            #:install-source? #t
+            #:cargo-package-crates ''("livekit-protocol"
+                                      "livekit-runtime"
+                                      "livekit-api"
+                                      "webrtc-sys-build"
+                                      "webrtc-sys"
+                                      "libwebrtc"
+                                      "livekit")
+            #:cargo-package-flags ''("--no-metadata" "--no-verify"
+                                     "--exclude-lockfile")
+            #:phases
+            #~(modify-phases %standard-phases
+               (replace 'package
+                 (lambda* (#:key source (cargo-package-crates '())
+                           (cargo-package-flags '("--no-metadata" "--no-verify"))
+                           (vendor-dir "guix-vendor")
+                           #:allow-other-keys)
+                   (use-modules (ice-9 ftw))
+                   ;; Same as the standard package phase, but deletes
+                   ;; cargo's target/package/tmp-crate/ scratch directory
+                   ;; between the packaging loop and the repacking step.
+                   ;; Cargo copies .crate files there during packaging and
+                   ;; does not clean up.  The repacking step's recursive
+                   ;; find-files picks them up, and scandir confuses the
+                   ;; tmp-crate directory with an extracted crate when
+                   ;; names sort after "tmp-crate" alphabetically.
+                   (when (file-exists? "Cargo.toml.orig")
+                     (delete-file "Cargo.toml.orig"))
+                   (for-each
+                    (lambda (pkg)
+                      (apply invoke "cargo" "package" "--offline"
+                             "--package" pkg cargo-package-flags)
+                      (for-each
+                       (lambda (crate)
+                         (invoke "tar" "xzf" crate "-C" vendor-dir))
+                       (find-files "target/package" "\\.crate$"))
+                      ((assoc-ref %standard-phases 'patch-cargo-checksums)
+                       #:vendor-dir vendor-dir))
+                    cargo-package-crates)
+                   ;; Delete cargo's scratch directory.
+                   (when (file-exists? "target/package/tmp-crate")
+                     (delete-file-recursively "target/package/tmp-crate"))
+                   ;; Repack crates with deterministic timestamps.
+                   (with-directory-excursion "target/package"
+                     (for-each
+                      (lambda (crate)
+                        (invoke "tar" "xf" crate)
+                        (delete-file crate)
+                        (let ((dir
+                               (car (scandir
+                                     "."
+                                     (lambda (file)
+                                       (and (not (member file '("." "..")))
+                                            (not (string-suffix?
+                                                  ".crate" file))))))))
+                          (for-each
+                           (lambda (file)
+                             (let ((s (lstat file)))
+                               (unless (eq? (stat:type s) 'symlink)
+                                 (utime file 0 0 0 0))))
+                           (find-files dir #:directories? #t))
+                          (apply invoke "tar" "czf"
+                                 (string-append dir ".crate")
+                                 "--sort=name" "--mtime=@0"
+                                 "--owner=root:0" "--group=root:0"
+                                 (find-files dir #:directories? #t))
+                          (delete-file-recursively dir)))
+                      (find-files "." "\\.crate$"))))))))
+     (inputs (cargo-inputs 'rust-livekit-0.7.8.5f04705))
+     (home-page "https://github.com/livekit/rust-sdks")
+     (synopsis "LiveKit real-time communication SDK for Rust")
+     (description
+      "This package provides a LiveKit real-time communication SDK for Rust.")
+     (license license:asl2.0))))
+
+;; Workspace dependency of zed.
+;;
+;; Cargo side: Cargo unifies dependency versions across zed's
+;; workspace, including this package's transitive dependencies,
+;; and records them in zed's Cargo.lock.
+;;
+;; Guix side: zed's cargo-inputs entry (generated from zed's
+;; Cargo.lock) already contains all of this package's transitive
+;; dependencies, so this package reuses zed's cargo-inputs.
+(define-public rust-notify-8.2.0.ce58c24
+  (hidden-package
+   (package
+     (name "rust-notify")
+     (version "8.2.0")
+     (source
+      (origin
+        (method git-fetch)
+        (uri
+         (git-reference
+          (url "https://github.com/zed-industries/notify.git")
+          (commit "ce58c24cad542c28e04ced02e20325a4ec28a31d")))
+        (file-name
+         (git-file-name "rust-notify" "8.2.0.ce58c24"))
+        (sha256
+         (base32 "09zn3ll1vlsblgrdacyw3zx58xzdxlab8ba7h22bbb57n76dmkl0"))))
+     (build-system cargo-build-system)
+     (arguments
+      (list #:skip-build? #t
+            #:install-source? #t
+            #:cargo-package-crates ''("notify-types"
+                                      "notify")
+            #:cargo-package-flags ''("--no-metadata" "--no-verify"
+                                     "--exclude-lockfile")))
+     (inputs (cargo-inputs 'rust-notify-8.2.0.ce58c24))
+     (home-page "https://github.com/notify-rs/notify")
+     (synopsis "Cross-platform filesystem notification library")
+     (description
+      "This package provides a cross-platform filesystem notification library
+for Rust.")
+     (license (list license:asl2.0 license:expat)))))
+
 (define-public rust-pcre2-utf32-0.2
  (hidden-package
   (package
@@ -227,6 +574,77 @@ UTF-32 support.")
            "0zgqklzmyk893n82zq8d0is57npvy9lsfpqb83h1bbx9c42fl35p"))))
       (inputs (cargo-inputs 'rust-pipewire-0.8.0.93138d0))))))

+;; Workspace dependency of zed.
+;;
+;; Cargo side: Cargo unifies dependency versions across zed's
+;; workspace, including this package's transitive dependencies,
+;; and records them in zed's Cargo.lock.
+;;
+;; Guix side: zed's cargo-inputs entry (generated from zed's
+;; Cargo.lock) already contains all of this package's transitive
+;; dependencies, so this package reuses zed's cargo-inputs.
+(define-public rust-pet-0.1.0.d5b5bb0
+  (hidden-package
+   (package
+     (name "rust-pet")
+     (version "0.1.0")
+     (source
+      (origin
+        (method git-fetch)
+        (uri
+         (git-reference
+          (url "https://github.com/microsoft/python-environment-tools.git")
+          (commit "d5b5bb0c4558a51d8cc76b514bc870fd1c042f16")))
+        (file-name
+         (git-file-name "rust-pet" "0.1.0.d5b5bb0"))
+        (sha256
+         (base32 "01djr1761l7c889v9lng7igjqxiz208r2vrwij661cn2fy5xcm5f"))))
+     (build-system cargo-build-system)
+     (arguments
+      (list #:skip-build? #t
+            #:install-source? #t
+            #:cargo-package-crates ''("pet-fs"
+                                      "pet-core"
+                                      "pet-python-utils"
+                                      "pet-jsonrpc"
+                                      "pet-reporter"
+                                      "pet-conda"
+                                      "pet-virtualenv"
+                                      "pet-virtualenvwrapper"
+                                      "pet-env-var-path"
+                                      "pet-global-virtualenvs"
+                                      "pet-homebrew"
+                                      "pet-linux-global-python"
+                                      "pet-mac-commandlinetools"
+                                      "pet-mac-python-org"
+                                      "pet-mac-xcode"
+                                      "pet-pipenv"
+                                      "pet-pixi"
+                                      "pet-poetry"
+                                      "pet-pyenv"
+                                      "pet-telemetry"
+                                      "pet-uv"
+                                      "pet-venv"
+                                      "pet-windows-store"
+                                      "pet-windows-registry"
+                                      "pet")
+            #:cargo-package-flags ''("--no-metadata" "--no-verify"
+                                     "--exclude-lockfile")
+            #:phases
+            #~(modify-phases %standard-phases
+                (add-after 'unpack 'fix-versions
+                  (lambda _
+                    (let ((version #$(package-version this-package)))
+                      (substitute* (find-files "." "^Cargo[.]toml$")
+                        (("^(pet-[a-z-]*) = [{] path = \"([^\"]*)\" [}]" x pkg path)
+                         (string-append pkg " = { version = \"" version "\", path = \"" path "\" }")))))))))
+     (inputs (cargo-inputs 'rust-pet-0.1.0.d5b5bb0))
+     (home-page "https://github.com/microsoft/python-environment-tools")
+     (synopsis "Python environment tools")
+     (description
+      "This package provides Python environment tools.")
+     (license license:expat))))
+
 (define-public rust-pubgrub-0.3.0.b70cf70
  (let ((commit "b70cf707aa43f21b32f3a61b8a0889b15032d5c4")
        (revision "0"))
@@ -677,6 +1095,47 @@ intelligence.")
      (inputs (cons oniguruma
                    (cargo-inputs 'rust-syntect-5.3))))))

+;; Workspace dependency of zed.
+;;
+;; Cargo side: Cargo unifies dependency versions across zed's
+;; workspace, including this package's transitive dependencies,
+;; and records them in zed's Cargo.lock.
+;;
+;; Guix side: zed's cargo-inputs entry (generated from zed's
+;; Cargo.lock) already contains all of this package's transitive
+;; dependencies, so this package reuses zed's cargo-inputs.
+(define-public rust-tiktoken-rs-0.9.1.2570c43
+  (hidden-package
+   (package
+     (name "rust-tiktoken-rs")
+     (version "0.9.1")
+     (source
+      (origin
+        (method git-fetch)
+        (uri
+         (git-reference
+          (url "https://github.com/zed-industries/tiktoken-rs")
+          (commit "2570c4387a8505fb8f1d3f3557454b474f1e8271")))
+        (file-name
+         (git-file-name "rust-tiktoken-rs" "0.9.1.2570c43"))
+        (sha256
+         (base32 "0yki1whx16xqgsrnr6gjsxakj6qzyvz958g6c9h15xp154kw6573"))))
+     (build-system cargo-build-system)
+     (arguments
+      (list #:skip-build? #t
+            #:install-source? #t
+            #:cargo-package-crates ''("tiktoken-rs")
+            #:cargo-package-flags ''("--no-metadata" "--no-verify"
+                                     "--exclude-lockfile")))
+     (inputs (cargo-inputs 'rust-tiktoken-rs-0.9.1.2570c43))
+     (home-page "https://github.com/zurawiki/tiktoken-rs")
+     (synopsis "Rust library for OpenAI's BPE tokenizer")
+     (description
+      "This package provides Rust bindings for OpenAI's @acronym{BPE, byte
+pair encoding} tokenizer, used to count and manage tokens for OpenAI
+language models.")
+     (license license:expat))))
+
 (define-public rust-tikv-jemallocator-for-polars
  (let ((commit "c7991e5bb6b3e9f79db6b0f48dcda67c5c3d2936")
        (revision "0"))
@@ -960,3 +1419,95 @@ and runtime for AI-assisted coding.")
    (description "Glycin is a sandbox image decoder for image viewers and
 thumbnails to display untrusted content safely.")
    (license (list license:mpl2.0 license:lgpl2.1+))))
+
+;; Workspace dependency of zed.
+;;
+;; Cargo side: Cargo unifies dependency versions across zed's
+;; workspace, including this package's transitive dependencies,
+;; and records them in zed's Cargo.lock.
+;;
+;; Guix side: zed's cargo-inputs entry (generated from zed's
+;; Cargo.lock) already contains all of this package's transitive
+;; dependencies, so this package reuses zed's cargo-inputs.
+(define-public rust-zed-xim-0.4.0-zed.16f35a2
+  (hidden-package
+   (package
+     (name "rust-zed-xim")
+     (version "0.4.0-zed")
+     (source
+      (origin
+        (method git-fetch)
+        (uri
+         (git-reference
+          (url "https://github.com/zed-industries/xim-rs.git")
+          (commit "16f35a2c881b815a2b6cdfd6687988e84f8447d8")))
+        (file-name
+         (git-file-name "rust-zed-xim" "0.4.0-zed.16f35a2"))
+        (sha256
+         (base32 "14cyxxdgjpbkf8ny4c46cfqjinavi2cyxzwfngldlls97m5zh555"))))
+     (build-system cargo-build-system)
+     (arguments
+      (list #:skip-build? #t
+            #:install-source? #t
+            #:cargo-package-crates ''("xim-ctext"
+                                      "xim-parser"
+                                      "zed-xim")
+            #:cargo-package-flags ''("--no-metadata" "--no-verify"
+                                     "--exclude-lockfile")
+            #:phases
+            #~(modify-phases %standard-phases
+               (replace 'package
+                 (lambda* (#:key source (cargo-package-crates '())
+                           (cargo-package-flags '("--no-metadata" "--no-verify"))
+                           (vendor-dir "guix-vendor")
+                           #:allow-other-keys)
+                   (use-modules (ice-9 ftw))
+                   ;; Same as the standard package phase, but deletes
+                   ;; cargo's target/package/tmp-crate/ scratch directory
+                   ;; between the packaging loop and the repacking step.
+                   (when (file-exists? "Cargo.toml.orig")
+                     (delete-file "Cargo.toml.orig"))
+                   (for-each
+                    (lambda (pkg)
+                      (apply invoke "cargo" "package" "--offline"
+                             "--package" pkg cargo-package-flags)
+                      (for-each
+                       (lambda (crate)
+                         (invoke "tar" "xzf" crate "-C" vendor-dir))
+                       (find-files "target/package" "\\.crate$"))
+                      ((assoc-ref %standard-phases 'patch-cargo-checksums)
+                       #:vendor-dir vendor-dir))
+                    cargo-package-crates)
+                   (when (file-exists? "target/package/tmp-crate")
+                     (delete-file-recursively "target/package/tmp-crate"))
+                   (with-directory-excursion "target/package"
+                     (for-each
+                      (lambda (crate)
+                        (invoke "tar" "xf" crate)
+                        (delete-file crate)
+                        (let ((dir
+                               (car (scandir
+                                     "."
+                                     (lambda (file)
+                                       (and (not (member file '("." "..")))
+                                            (not (string-suffix?
+                                                  ".crate" file))))))))
+                          (for-each
+                           (lambda (file)
+                             (let ((s (lstat file)))
+                               (unless (eq? (stat:type s) 'symlink)
+                                 (utime file 0 0 0 0))))
+                           (find-files dir #:directories? #t))
+                          (apply invoke "tar" "czf"
+                                 (string-append dir ".crate")
+                                 "--sort=name" "--mtime=@0"
+                                 "--owner=root:0" "--group=root:0"
+                                 (find-files dir #:directories? #t))
+                          (delete-file-recursively dir)))
+                      (find-files "." "\\.crate$"))))))))
+     (inputs (cargo-inputs 'rust-zed-xim-0.4.0-zed.16f35a2))
+     (home-page "https://github.com/XDeme1/xim-rs")
+     (synopsis "X input method client and server")
+     (description
+      "This package provides a library for @code{xim}, the X input method.")
+     (license license:expat))))
@@ -1465,12 +1465,12 @@ inference for statistical models.")
                         "|"))))))))
    (native-inputs
     (list bison
-           dvisvgm
           flex
           python-numpydoc
           python-sphinx
           ;; python-sphinx-gallery ;; Currently broken
-           swig-4.0))
+           swig-4.0
+           texlive-dvisvgm))
    (inputs
     (list openblas                ; the only required dependency
           ;; The dependencies below are all optional.
@@ -77776,46 +77776,7 @@ documents.  It makes writing LaTeX comfortable by providing features such as
 syntax-highlighting, an integrated viewer and reference checking.")
    (license license:gpl3)))

-(define-public dvisvgm
-  (package
-    (name "dvisvgm")
-    (version "3.0.3")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/mgieseki/dvisvgm")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11r401yqbw61n1mwsfk5qmwx2c92djwpl0q756qkds5kh25l9ci8"))))
-    (native-inputs (list pkg-config
-                         autoconf
-                         autoconf-archive
-                         automake
-                         python-wrapper
-                         libtool))
-    (inputs (list texlive-libkpathsea
-                  freetype
-                  fontforge
-                  clipper
-                  ghostscript
-                  xxhash
-                  brotli
-                  woff2
-                  zlib))
-    (build-system gnu-build-system)
-    (synopsis "Command-line utility for generating SVG from DVI, EPS and PDF
-files")
-    (description
-     "Dvisvgm converts TeX DVI, EPS and PDF files into an
-SVG (Scalable Vector Graphics) image.  It provides full font support including
-virtual fonts, font maps and sub-fonts.  The embedded SVG fonts can optionally
-be replaced with graphics paths for applications that do not support SVG
-fonts.  Dvisvgm supports also colors, emTeX, tpic, papersize, PDF mapfile
-and PostScript specials.  A working TeX installation is needed.")
-    (home-page "https://dvisvgm.de/")
-    (license license:gpl3+)))
+(define-deprecated-package dvisvgm texlive-dvisvgm) ;14/04/26

 (define-public teximpatient
  ;; The homepage seems to be distributing this version which is currently the
@@ -121,6 +121,7 @@
  #:use-module (gnu packages pcre)
  #:use-module (gnu packages perl)
  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages protobuf)
  #:use-module (gnu packages python)
  #:use-module (gnu packages python-build)
  #:use-module (gnu packages python-web)
@@ -133,7 +134,10 @@
  #:use-module (gnu packages sqlite)
  #:use-module (gnu packages terminals)
  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages tls)
  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages vulkan)
+  #:use-module (gnu packages xdisorg)
  #:use-module (gnu packages xml)
  #:use-module (gnu packages xorg))

@@ -2018,3 +2022,171 @@ with full unicode support and antialiased text rendering.")
 syntax highlighting, customizable color scheme (including support for 24-bit true
 colours), kitty keyboard protocol, editorconfig support, amongst other features.")
    (license license:gpl2)))
+
+(define-public zed
+  (package
+    (name "zed")
+    (version "0.225.10")
+    (outputs '("out"            ; editor, cli, icons, desktop file
+               "remote"         ; zed-remote-server for remote development
+               "server"         ; collab server daemon
+               "tools"))        ; extension_cli
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/zed-industries/zed")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1d6zr88s4nj4fw01gw908aw2mqgjj25baj4gx7qnm6rsbxqrp500"))
+       (patches
+        (search-patches "zed-0.225.10-add-message-notification-action.patch"
+                        "zed-0.225.10-add-guix-container-support.patch"
+                        "zed-0.225.10-collapse-multiline-git-deps.patch"
+                        "zed-0.225.10-disable-dlopen.patch"
+                        "zed-0.225.10-exclude-libwebrtc-from-audio.patch"
+                        "zed-0.225.10-fix-sqlite-memory-mode.patch"
+                        "zed-0.225.10-fix-test-db-isolation.patch"
+                        "zed-0.225.10-fix-workspace-race.patch"
+                        "zed-0.225.10-keep-regular-file-workspaces.patch"
+                        "zed-0.225.10-remove-patch-crates-io.patch"
+                        "zed-0.225.10-use-mock-livekit-on-linux.patch"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:install-source? #f
+           #:cargo-build-flags ''("--release" "-p" "zed")
+           ;; Not installed:
+           ;; auto_update_helper - Windows-only (empty main on Linux)
+           ;; eval - internal AI agent benchmarking tool
+           ;; edit_prediction_cli - internal edit prediction training pipeline
+           ;; storybook - GPUI component viewer for Zed UI development
+           ;; docs_preprocessor - mdbook preprocessor for Zed's docs website
+           ;; zed_visual_test_runner - visual regression tests, macOS-only
+           #:cargo-install-paths ''("crates/zed"
+                                    "crates/cli" ; opens files in running Zed
+                                    ;;; Install remote_server via its own cargo invocation
+                                    ;;; to avoid feature unification with the zed build.
+                                    "crates/remote_server" ; installs as zed-remote-server
+                                    "crates/collab" ; self-hostable collaboration server
+                                    "crates/extension_cli") ; builds extensions from source
+           #:phases
+           #~(modify-phases %standard-phases
+              (add-after 'install 'install-extras
+                (lambda* (#:key outputs #:allow-other-keys)
+                  (let* ((out (assoc-ref outputs "out"))
+                         (bin (string-append out "/bin"))
+                         (libexec (string-append out "/libexec"))
+                         (icons512 (string-append out "/share/icons/hicolor/512x512/apps"))
+                         (icons1024 (string-append out "/share/icons/hicolor/1024x1024/apps"))
+                         (apps (string-append out "/share/applications"))
+                         (remote-bin (string-append (assoc-ref outputs "remote") "/bin"))
+                         (server-bin (string-append (assoc-ref outputs "server") "/bin"))
+                         (tools-bin (string-append (assoc-ref outputs "tools") "/bin")))
+                    ;;; The cli binary is the user-facing launcher that finds
+                    ;;; and delegates to zed-editor via ../libexec/zed-editor.
+                    (mkdir-p libexec)
+                    (rename-file (string-append bin "/zed")
+                                 (string-append libexec "/zed-editor"))
+                    (rename-file (string-append bin "/cli")
+                                 (string-append bin "/zed"))
+                    ;;; Move remote_server to "remote" output as zed-remote-server.
+                    (mkdir-p remote-bin)
+                    (rename-file (string-append bin "/remote_server")
+                                 (string-append remote-bin "/zed-remote-server"))
+                    ;;; Move collab to "server" output.
+                    (mkdir-p server-bin)
+                    (rename-file (string-append bin "/collab")
+                                 (string-append server-bin "/collab"))
+                    (rename-file (string-append bin "/dotenv")
+                                 (string-append server-bin "/dotenv"))
+                    ;;; Move zed-extension to "tools" output.
+                    (mkdir-p tools-bin)
+                    (rename-file (string-append bin "/zed-extension")
+                                 (string-append tools-bin "/zed-extension"))
+                    ;;; Icons.
+                    (mkdir-p icons512)
+                    (mkdir-p icons1024)
+                    (copy-file "crates/zed/resources/app-icon.png"
+                               (string-append icons512 "/zed.png"))
+                    (copy-file "crates/zed/resources/app-icon@2x.png"
+                               (string-append icons1024 "/zed.png"))
+                    ;;; Desktop file.
+                    (mkdir-p apps)
+                    (copy-file "crates/zed/resources/zed.desktop.in"
+                               (string-append apps "/dev.zed.Zed.desktop"))
+                    (substitute* (string-append apps "/dev.zed.Zed.desktop")
+                      (("\\$APP_NAME") "Zed")
+                      (("\\$APP_CLI") "zed")
+                      (("\\$APP_ARGS") "%U")
+                      (("\\$APP_ICON") "zed")
+                      (("\\$DO_STARTUP_NOTIFY") "true")))))
+              (add-after 'unpack 'set-env
+                (lambda _
+                  (setenv "LIBGIT2_NO_VENDOR" "1")
+                  (setenv "LIBSQLITE3_SYS_USE_PKG_CONFIG" "1")))
+              (add-after 'set-env 'patch-git-deps
+                (lambda _
+                  ;; All multi-line entries are collapsed to single
+                  ;; lines by the patch.  reqwest and scap already
+                  ;; carry version fields; just strip the git source.
+                  (substitute* "Cargo.toml"
+                    (("(reqwest = \\{) git = \"[^\"]+\", rev = \"[^\"]+\", " _ prefix)
+                     (string-append prefix " "))
+                    (("(scap = \\{) git = \"[^\"]+\", rev = \"[^\"]+\", " _ prefix)
+                     (string-append prefix " ")))
+                  ;; Replace all remaining git fields with version = "*"
+                  ;; and strip rev/branch.
+                  (substitute* "Cargo.toml"
+                    (("git = \"https://[^\"]+\"")
+                     "version = \"*\"")
+                    ((", rev = \"[^\"]+\"") "")
+                    ((", branch = \"[^\"]+\"") ""))
+                  ;; Sub-crate Cargo.toml files also have git deps.
+                  (for-each
+                   (lambda (file)
+                     ;; rev-before-git deps: replace pair with version = "*".
+                     (substitute* file
+                       (("rev = \"[^\"]+\", git = \"[^\"]+\"")
+                        "version = \"*\""))
+                     ;; git-before-rev deps that already carry a version
+                     ;; field: strip git+rev, keep everything else.
+                     (substitute* file
+                       (("git = \"[^\"]+\" *, rev = \"[^\"]+\" *, ") "")
+                       ((", git *= *\"[^\"]+\"") "")
+                       ((", branch = \"[^\"]+\"") "")))
+                   (find-files "crates" "^Cargo\\.toml$"))
+                  ;; nvim-rs has no version field; add one.
+                  (substitute* "crates/vim/Cargo.toml"
+                    (("(nvim-rs = \\{) " _ prefix)
+                     (string-append prefix " version = \"*\", "))))))))
+    (native-inputs (list cmake-minimal pkg-config protobuf))
+    (inputs
+     (cons* alsa-lib
+            bzip2
+            dbus
+            fontconfig
+            freetype
+            libgit2-1.9
+            libx11
+            libxcb
+            libxkbcommon
+            openssl
+            sqlite
+            vulkan-loader
+            wayland
+            wayland-protocols
+            xcb-util-cursor
+            zlib
+            (list zstd "lib")
+            (cargo-inputs 'zed)))
+    (home-page "https://zed.dev")
+    (synopsis "High-performance, multiplayer code editor")
+    (description
+     "Zed is a high-performance, multiplayer code editor written in Rust.
+
+Note: This build disables WebRTC (libwebrtc) support because libwebrtc is
+not yet packaged in Guix.  As a result, voice and video calls in collaborative
+sessions are not available.  Text-based collaboration, editing, and all other
+features work normally.")
+    (license license:gpl3+)))
@@ -2560,7 +2560,7 @@ Open Container Initiative (OCI) image layout and its tagged images.")
 (define-public skopeo
  (package
    (name "skopeo")
-    (version "1.22.1")
+    (version "1.22.2")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -2569,7 +2569,7 @@ Open Container Initiative (OCI) image layout and its tagged images.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0h32h02dvh6dx587idqi11938k293kawvd4d3xk5hwdi6cmpabri"))))
+                "05ag8rj2w6p78llhiwb2h460nf0vn7mppaara6l1dcb84sycj8jg"))))
    (build-system gnu-build-system)
    (native-inputs
     (list go-1.24
Author	SHA1	Message	Date
Nicolas Graves	da8f3beef2	gnu: googletest: Drop input labels. * gnu/packages/check.scm (googletest)[native-inputs]: Drop input labels. Change-Id: I588976a404ebeb2613ccc13d52b9a4d5b1de5903 Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>	2026-04-15 13:13:12 +09:00
aecepoglu	4a4ef229e6	gnu: sbcl-coalton: Update to 0.0.1-5.bf475c8. * gnu/packages/lisp-xyz.scm (sbcl-coalton): Update to 0.0.1-5.bf475c8. Change-Id: I92c6a057b982500ba0629ed663c5a86c0616e358 Signed-off-by: jgart <jgart@dismail.de>	2026-04-14 22:03:56 -04:00
Danny Milosavljevic	2c51b803e3	gnu: Add zed. * 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	2026-04-15 03:19:10 +02:00
jgart	6690bf46c6	gnu: trealla: Update to 2.92.30. * gnu/packages/prolog.scm (trealla): Update to 2.92.30. [inputs]: Add libedit. Change-Id: Ica510ab3eed3f79a5333dda8b5f2a460780467e7	2026-04-14 19:16:11 -04:00
Igorj Gorjaĉev	58266bb4ba	gnu: jpm: Update to 1.2.0. * gnu/packages/lisp.scm (jpm): Update to 1.2.0. Change-Id: Ib8c7c9ac1e66a767b9e280761ae48140f866a443 Signed-off-by: Andreas Enge <andreas@enge.fr>	2026-04-14 22:58:15 +02:00
Foster Hangdaan	69f512e520	gnu: skopeo: Update to 1.22.2. * gnu/packages/virtualization.scm (skopeo): Update to 1.22.2. Change-Id: I7c860a205c40cd5efd329770f6262b80716b2e4d Signed-off-by: Andreas Enge <andreas@enge.fr>	2026-04-14 22:38:26 +02:00
Foster Hangdaan	83e5fe437f	gnu: podman: Update to 5.8.2. * gnu/packages/containers.scm (podman): Update to 5.8.2. Change-Id: I681067e7c2ac11f4e12c94db5898e121b6a1e0f2 Signed-off-by: Andreas Enge <andreas@enge.fr>	2026-04-14 22:21:25 +02:00
Nicolas Goaziou	ef81d340cd	gnu: dvisvgm: Deprecate in favor of texlive-dvisvgm. * gnu/packages/tex.scm (dvisvgm): Deprecate. * etc/teams/tex/tex-manifest.scm (%sundry-texlive-packages): Do not monitor dvisvgm anymore. * gnu/packages/statistics.scm (python-openturns): Use texlive-dvisvgm. Change-Id: I1903a0bdd4e66f9f2a49d21029371e87924435ac	2026-04-14 22:17:55 +02:00
André Batista	5ce1b4a3e3	gnu: ublock-origin: Update to 1.70.0. * gnu/packages/browser-extensions.scm (ublock-origin): Update to 1.70.0. (ublock-main-assets): Update to 0-6.004af606e6a0e. (ublock-prod-assets): Update to 0-6.6c15e4ef91888. Change-Id: I730ef9d4623a9abe972d82c5700458f6c888077c Signed-off-by: Andreas Enge <andreas@enge.fr>	2026-04-14 21:19:44 +02:00
Artyom V. Poptsov	e155ef7c4b	gnu: Add guile-pnm. * gnu/packages/guile-xyz.scm (guile-pnm): New variable. Change-Id: I0e5e2fa77c6d75567983ab61c61880bef34f3e30	2026-04-14 20:03:58 +03:00