flake.lock

@@ -147,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711588700,
+        "lastModified": 1711462743,
-        "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=",
+        "narHash": "sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "502241afa3de2a24865ddcbe4c122f4546e32092",
+        "rev": "a6717b1afee7ae955c61eefdf0ce8f864ef78115",
         "type": "github"
       },
       "original": {
@@ -171,11 +171,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1711604862,
+        "lastModified": 1711530423,
-        "narHash": "sha256-unfcrYWtZn+xIAcwfXNh2s1/ZpG9HObEHJG6I7yBliI=",
+        "narHash": "sha256-Z7JxlKxbhGWLOvypllSMGhDMWd/A2Hv8zRKJY3a9TTY=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "593fd7712944cec2a04b0f5d54b22e35fe03290b",
+        "rev": "9f6f38ce57d29b78cc6db45cf87813ae631641ec",
         "type": "github"
       },
       "original": {
@@ -468,11 +468,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711604890,
+        "lastModified": 1711133180,
-        "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=",
+        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df",
+        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
         "type": "github"
       },
       "original": {
@@ -640,11 +640,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1711460390,
+        "lastModified": 1711124224,
-        "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
+        "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
+        "rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
         "type": "github"
       },
       "original": {
@@ -688,11 +688,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1711523803,
+        "lastModified": 1711333969,
-        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
+        "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
+        "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b",
         "type": "github"
       },
       "original": {
@@ -817,11 +817,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711592024,
+        "lastModified": 1711505476,
-        "narHash": "sha256-oD4OJ3TRmVrbAuKZWxElRCyCagNCDuhfw2exBmNOy48=",
+        "narHash": "sha256-yK1zue1c8EdpZvEyQWrjawG9Ykzl7eB2xJ/V+2vU5Jo=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "aa858717377db2ed8ffd2d44147d907baee656e5",
+        "rev": "56f48d6e7559b807763ea03191bfaf95549ce610",
         "type": "github"
       },
       "original": {

pkgs/zed/Cargo.lock

@@ -12758,7 +12758,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.127.5"
+version = "0.127.3"
 dependencies = [
  "activity_indicator",
  "anyhow",

pkgs/zed/default.nix

@@ -5,32 +5,31 @@
   curl,
   pkg-config,
   protobuf,
-  xcbuild,
   fontconfig,
   freetype,
   libgit2,
+  libxkbcommon,
   openssl,
   sqlite,
+  vulkan-loader,
+  xorg,
   zlib,
   zstd,
-  alsa-lib,
-  libxkbcommon,
-  wayland,
-  xorg,
   stdenv,
   darwin,
-  vulkan-loader,
+  alsa-lib,
+  wayland,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "zed";
-  version = "0.127.5";
+  version = "0.127.3";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
-    rev = "refs/tags/v${version}";
+    rev = "v${version}";
-    hash = "sha256-clMPXz6htCGoX7wcONo68kacPSvgrAd6SH5VDHSGyOM=";
+    hash = "sha256-qzQ0mOY8/reyQqTddG5nqtXDcyPJvrz/HUFci6fNums=";
     fetchSubmodules = true;
   };
 
@@ -84,12 +83,14 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
+  doCheck = false;
+
   nativeBuildInputs = [
     curl
     pkg-config
     protobuf
     rustPlatform.bindgenHook
-  ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ];
+  ];
 
   buildInputs =
     [
@@ -97,78 +98,45 @@ rustPlatform.buildRustPackage rec {
       fontconfig
       freetype
       libgit2
+      libxkbcommon
       openssl
       sqlite
+      vulkan-loader
+      xorg.libxcb
       zlib
       zstd
     ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.AppKit
+      darwin.apple_sdk.frameworks.CoreAudio
+      darwin.apple_sdk.frameworks.CoreFoundation
+      darwin.apple_sdk.frameworks.CoreGraphics
+      darwin.apple_sdk.frameworks.CoreServices
+      darwin.apple_sdk.frameworks.CoreText
+      darwin.apple_sdk.frameworks.Foundation
+      darwin.apple_sdk.frameworks.IOKit
+      darwin.apple_sdk.frameworks.Metal
+      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.SystemConfiguration
+    ]
     ++ lib.optionals stdenv.isLinux [
       alsa-lib
-      libxkbcommon
       wayland
-      xorg.libxcb
+    ];
-    ]
-    ++ lib.optionals stdenv.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        AppKit
-        CoreAudio
-        CoreFoundation
-        CoreGraphics
-        CoreMedia
-        CoreServices
-        CoreText
-        Foundation
-        IOKit
-        Metal
-        Security
-        SystemConfiguration
-        VideoToolbox
-      ]
-    );
-
-  buildFeatures = [ "gpui/runtime_shaders" ];
 
   env = {
     ZSTD_SYS_USE_PKG_CONFIG = true;
   };
 
-  postFixup = lib.optionalString stdenv.isLinux ''
-    patchelf --add-rpath ${vulkan-loader}/lib $out/bin/*
-  '';
-
-  # Fail with "unimplemented error"
-  checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
-    "--skip=test_base_keymap"
-    "--skip=test_bundled_settings_and_themes"
-    "--skip=test_disabled_keymap_binding"
-    "--skip=test_navigation"
-    "--skip=test_new_empty_workspace"
-    "--skip=test_open_and_save_new_file"
-    "--skip=test_open_entry"
-    "--skip=test_opening_excluded_paths"
-    "--skip=test_open_paths"
-    "--skip=test_open_paths_action"
-    "--skip=test_pane_actions"
-    "--skip=test_reopening_closed_items"
-    "--skip=test_save_conflicting_item"
-    "--skip=test_setting_language_when_saving_as_single_file_worktree"
-    "--skip=test_window_edit_state"
-    "--skip=test_open_add_new"
-    "--skip=test_open_file_in_many_spaces"
-    "--skip=test_open_non_existing_file"
-  ];
-
   meta = with lib; {
-    description = "A high-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
+    description = "Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
-    homepage = "https://zed.dev";
+    homepage = "https://github.com/zed-industries/zed";
-    changelog = "https://github.com/zed-industries/zed/releases/tag/v${version}";
+    license = with licenses; [
-    license = licenses.gpl3Only;
+      asl20
-    maintainers = with maintainers; [
+      agpl3Only
-      GaetanLepage
+      gpl3Only
-      niklaskorz
     ];
+    maintainers = with maintainers; [ ];
     mainProgram = "zed";
-    platforms = platforms.all;
   };
 }