Update to Zig 0.16.0

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.16.0-dev.2471+e9eadee00
+          version: 0.16.0
 
       - uses: DeterminateSystems/nix-installer-action@main
 
@@ -31,14 +31,14 @@ jobs:
       - name: Run executable on zls
         run: |
           git clone https://github.com/zigtools/zls
-          nix run .#overlay_0_16 -- zls
-          nix run . -- zls
+          nix run .# -- zls
+          nix run .# -- zls
 
       - name: Run integration tests for issue 60
         run: |
           nix --version
-          nix run .#overlay_0_16_debug -- fixtures/integrationtest/issue60-1-build.zig.zon
-          nix run .#overlay_0_16_debug -- fixtures/integrationtest/issue60-2-build.zig.zon
+          nix run .# -- fixtures/integrationtest/issue60-1-build.zig.zon
+          nix run .# -- fixtures/integrationtest/issue60-2-build.zig.zon
 
   format:
     name: format
@@ -50,7 +50,7 @@ jobs:
       - name: Set up zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.16.0-dev.2471+e9eadee00
+          version: 0.16.0
 
       - name: Check formatting
         run: zig fmt --check .

README.md

@@ -14,7 +14,10 @@ To use the generated file, add this to your Nix expression:
 
 ```nix
 postPatch = ''
-  ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+  # For Zig version < 0.16.0, uncomment the following line
+  # ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+  # For Zig version >= 0.16.0
+  ln -s ${pkgs.callPackage ./nix/deps.nix { }} zig-pkg
 '';
 ```
 

flake.nix

@@ -7,10 +7,6 @@
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    zig-overlay = {
-      url = "github:mitchellh/zig-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
@@ -38,48 +34,18 @@
         let
           inherit (pkgs)
             callPackage
-            zigpkgs
             zig_0_13
             zig_0_14
+            zig_0_15
+            zig_0_16
             ;
-          zig_0_16 = zigpkgs.master-2026-02-03;
-          zig_0_16_for_overlay = zig_0_16.overrideAttrs (
-            f: p: {
-                passthru.hook = callPackage "${inputs.nixpkgs}/pkgs/development/compilers/zig/hook.nix" {
-                  zig = pkgs.lib.recursiveUpdate f.finalPackage {
-                    # Aparantly, `platforms` and `maintainers` are missing from the nightly. We use the ones
-                    # from 0.14, assuming that the values are the same.
-                    meta = { inherit (zig_0_14.meta) platforms maintainers; };
-                  };
-                };
-              }
-          );
         in
         {
-          _module.args.pkgs = import inputs.nixpkgs {
-            inherit system;
-            overlays = [
-              inputs.zig-overlay.overlays.default
-            ];
-            config = { };
-          };
-
           packages = {
-            default = callPackage ./nix/package.nix {
-              zig = zigpkgs.master.overrideAttrs (
-                f: p: {
-                  inherit (zig_0_14) meta;
-
-                  passthru.hook = callPackage "${inputs.nixpkgs}/pkgs/development/compilers/zig/hook.nix" {
-                    zig = f.finalPackage;
-                  };
-                }
-              );
-            };
-            default_0_14 = callPackage ./nix/package.nix { zig = zig_0_14; };
+            default = callPackage ./nix/package.nix { zig = zig_0_16; };
             default_0_13 = callPackage ./nix/package.nix { zig = zig_0_13; };
-            overlay_0_16 = callPackage ./nix/package.nix { zig = zig_0_16_for_overlay; };
-            overlay_0_16_debug = callPackage ./nix/package.nix { zig = zig_0_16_for_overlay; debug = true; };
+            default_0_14 = callPackage ./nix/package.nix { zig = zig_0_14; };
+            default_0_15 = callPackage ./nix/package.nix { zig = zig_0_15; };
           };
         };
     };

nix/package.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   src = ../.;
 
   nativeBuildInputs = [
-    zig.hook
+    zig
   ];
 
   zigBuildFlags = [