diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index af81eebb6f03..0e0d55693488 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -27,7 +27,6 @@ gitUpdater, cargo-about, versionCheckHook, - zed-editor, buildFHSEnv, cargo-bundle, git, @@ -59,6 +58,7 @@ let # extension tooling without significant pain. fhs = { + zed-editor, additionalPkgs ? pkgs: [ ], }: buildFHSEnv { @@ -98,7 +98,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.176.2"; + version = "0.176.3"; outputs = [ "out" ] @@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-uTq9/skBMz8n2NjGBQKOIOMp/rTDL+azEUzV4jTUJvE="; + hash = "sha256-5bn70R5phHZmAf/71IK8o2laHcCo92cCiaKQ7xo0Uag="; }; patches = [ @@ -136,7 +136,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-b4YTVrz2nOwQnVU42E+LD1YjsUAWN7+fCr2z8IVwH6o="; + cargoHash = "sha256-IaAY1u5xLomvUtb4FjE4uE0w01rMmyR/DH0QD9cOK5Y="; nativeBuildInputs = [ @@ -309,17 +309,22 @@ rustPlatform.buildRustPackage (finalAttrs: { rev-prefix = "v"; ignoredVersions = "(*-pre|0.999999.0|0.9999-temporary)"; }; - fhs = fhs { }; - fhsWithPackages = f: fhs { additionalPkgs = f; }; + fhs = fhs { zed-editor = finalAttrs.finalPackage; }; + fhsWithPackages = + f: + fhs { + zed-editor = finalAttrs.finalPackage; + additionalPkgs = f; + }; tests = { remoteServerVersion = testers.testVersion { - package = zed-editor.remote_server; + package = finalAttrs.finalPackage.remote_server; command = "zed-remote-server-stable-${finalAttrs.version} version"; }; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - withGles = zed-editor.override { withGLES = true; }; + withGles = finalAttrs.finalPackage.override { withGLES = true; }; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 178a8aa4de1f..2d787cf1f43a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15760,6 +15760,8 @@ with pkgs; autoconf = buildPackages.autoconf269; }; + zed-editor-fhs = zed-editor.fhs; + zgv = callPackage ../applications/graphics/zgv { # Enable the below line for terminal display. Note # that it requires sixel graphics compatible terminals like mlterm