Zedless versioning

crates/zed/Cargo.toml

@@ -152,6 +152,7 @@ workspace.workspace = true
 zed_actions.workspace = true
 zeta.workspace = true
 title_bar.workspace = true
+zedless.workspace = true
 zedless_settings.workspace = true
 zlog.workspace = true
 zlog_settings.workspace = true

crates/zed/src/zed.rs

@@ -947,24 +947,29 @@ fn about(
 ) {
     let release_channel = ReleaseChannel::global(cx).display_name();
     let version = env!("CARGO_PKG_VERSION");
+    let zedless_version = zedless::ZEDLESS_VERSION;
     let debug = if cfg!(debug_assertions) {
         "(debug)"
     } else {
         ""
     };
-    let message = format!("{release_channel} {version} {debug}");
-    let detail = AppCommitSha::try_global(cx).map(|sha| sha.full());
+    let message = format!("{release_channel} {zedless_version} {debug}");
+    let detail = if let Some(commit_hash) = AppCommitSha::try_global(cx).map(|sha| sha.full()) {
+        format!("{commit_hash}\n\nBased on Zed {version}")
+    } else {
+        format!("Based on Zed {version}")
+    };
 
     let prompt = window.prompt(
         PromptLevel::Info,
         &message,
-        detail.as_deref(),
+        Some(&detail),
         &["Copy", "OK"],
         cx,
     );
     cx.spawn(async move |_, cx| {
         if let Ok(0) = prompt.await {
-            let content = format!("{}\n{}", message, detail.as_deref().unwrap_or(""));
+            let content = format!("{}\n{}", message, detail);
             cx.update(|cx| {
                 cx.write_to_clipboard(gpui::ClipboardItem::new_string(content));
             })

crates/zedless/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zedless"
-version = "0.1.0"
+version = "1.0.0"
 edition.workspace = true
 publish.workspace = true
 license = "GPL-3.0-or-later"

crates/zedless/src/zedless.rs

@@ -11,3 +11,5 @@ impl From<anyhow::Error> for SilentError {
         SilentError::Error { error: err }
     }
 }
+
+pub const ZEDLESS_VERSION: &'static str = env!("CARGO_PKG_VERSION");

nix/package.nix

@@ -45,8 +45,8 @@ let
   gpu-lib = if withGLES then libglvnd else vulkan-loader;
 
   # Cargo.toml located in repo root does not contain any version information.
-  cargoToml = fromTOML (readFile ../crates/zed/Cargo.toml);
-  pname = "zedless";
+  cargoToml = fromTOML (readFile ../crates/zedless/Cargo.toml);
+  pname = cargoToml.package.name;
   version = cargoToml.package.version;
   src = toSource {
     root = ../.;