nix: update nixpkgs, remove zig.hook, and remove x11-gnome

.github/workflows/publish-tag.yml

@@ -64,7 +64,7 @@ jobs:
           mkdir blob
           mv appcast.xml blob/appcast.xml
       - name: Upload Appcast to R2
-        uses: ryand56/r2-upload-action@b801a390acbdeb034c5e684ff5e1361c06639e7c # v1
+        uses: ryand56/r2-upload-action@b801a390acbdeb034c5e684ff5e1361c06639e7c # v1.4
         with:
           r2-account-id: ${{ secrets.CF_R2_RELEASE_ACCOUNT_ID }}
           r2-access-key-id: ${{ secrets.CF_R2_RELEASE_AWS_KEY }}

flake.nix

@@ -28,14 +28,14 @@
     };
 
     zon2nix = {
-      url = "github:jcollie/zon2nix?rev=bf983aa90ff169372b9fa8c02e57ea75e0b42245";
+      url = "github:jcollie/zon2nix?rev=c28e93f3ba133d4c1b1d65224e2eebede61fd071";
       inputs = {
         nixpkgs.follows = "nixpkgs";
       };
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager?ref=release-25.05";
+      url = "github:nix-community/home-manager";
       inputs = {
         nixpkgs.follows = "nixpkgs";
       };
@@ -117,7 +117,6 @@
             wayland-gnome = runVM ./nix/vm/wayland-gnome.nix;
             wayland-plasma6 = runVM ./nix/vm/wayland-plasma6.nix;
             x11-cinnamon = runVM ./nix/vm/x11-cinnamon.nix;
-            x11-gnome = runVM ./nix/vm/x11-gnome.nix;
             x11-plasma6 = runVM ./nix/vm/x11-plasma6.nix;
             x11-xfce = runVM ./nix/vm/x11-xfce.nix;
           };

nix/devShell.nix

@@ -26,6 +26,7 @@
   wasmtime,
   wraptest,
   zig,
+  zig_0_15,
   zip,
   llvmPackages_latest,
   bzip2,

nix/package.nix

@@ -20,16 +20,6 @@
   wayland-scanner,
   pkgs,
 }: let
-  # The Zig hook has no way to select the release type without actual
-  # overriding of the default flags.
-  #
-  # TODO: Once
-  # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 is
-  # ultimately acted on and has made its way to a nixpkgs implementation, this
-  # can probably be removed in favor of that.
-  zig_hook = zig_0_15.hook.overrideAttrs {
-    zig_default_flags = "-Dcpu=baseline -Doptimize=${optimize} --color off";
-  };
   gi_typelib_path = import ./build-support/gi-typelib-path.nix {
     inherit pkgs lib stdenv;
   };
@@ -73,7 +63,7 @@ in
         ncurses
         pandoc
         pkg-config
-        zig_hook
+        zig_0_15
         gobject-introspection
         wrapGAppsHook4
         blueprint-compiler
@@ -92,12 +82,16 @@ in
 
     GI_TYPELIB_PATH = gi_typelib_path;
 
+    dontSetZigDefaultFlags = true;
+
     zigBuildFlags = [
       "--system"
       "${finalAttrs.deps}"
       "-Dversion-string=${finalAttrs.version}-${revision}-nix"
       "-Dgtk-x11=${lib.boolToString enableX11}"
       "-Dgtk-wayland=${lib.boolToString enableWayland}"
+      "-Dcpu=baseline"
+      "-Doptimize=${optimize}"
       "-Dstrip=${lib.boolToString strip}"
     ];
 

nix/tests.nix

@@ -274,7 +274,7 @@ in {
           client.succeed("${su "${ghostty} +new-window"}")
           client.wait_until_succeeds("${wm_class} | grep -q 'com.mitchellh.ghostty-debug'")
 
-      with subtest("SSH from client to server and verify that the Ghostty terminfo is copied.")
+      with subtest("SSH from client to server and verify that the Ghostty terminfo is copied."):
           client.sleep(2)
           client.send_chars("ssh ghostty@server\n")
           server.wait_for_file("${user.home}/.terminfo/x/xterm-ghostty", timeout=30)

nix/vm/common-gnome.nix

@@ -8,7 +8,7 @@
     ./common.nix
   ];
 
-  services.xserver = {
+  services = {
     displayManager = {
       gdm = {
         enable = true;

src/extra/bash.zig

@@ -296,7 +296,7 @@ fn writeBashCompletions(writer: *std.Io.Writer) !void {
         \\  else                    prev="${COMP_WORDS[COMP_CWORD-1]}"
         \\  fi
         \\
-        \\  # current completion is double quoted add a space so the curor progresses
+        \\  # current completion is double quoted add a space so the cursor progresses
         \\  if [[ "$2" == \"*\" ]]; then
         \\    COMPREPLY=( "$cur " );
         \\    return;

src/terminal/stream.zig

@@ -1641,7 +1641,7 @@ pub fn Stream(comptime Handler: type) type {
                                     },
                                 },
                                 else => {
-                                    log.warn("invalid set curor style command: {f}", .{input});
+                                    log.warn("invalid set cursor style command: {f}", .{input});
                                     return;
                                 },
                             };