switch from mitchellh/zig-overlay to silversquirl/zig-flake

Author: silversquirl

deps.nix

@@ -2,55 +2,33 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
 
-    zig-overlay.url = "github:mitchellh/zig-overlay";
-    zig-overlay.inputs.nixpkgs.follows = "nixpkgs";
+    zig.url = "github:silversquirl/zig-flake";
+    zig.inputs.nixpkgs.follows = "nixpkgs";
 
     gitignore.url = "github:hercules-ci/gitignore.nix";
     gitignore.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = {
-    self,
     nixpkgs,
-    zig-overlay,
+    zig,
     gitignore,
-  }:
-    builtins.abort "This flake is currently broken because Zig 0.15.1 is temporarily unavailable in https://github.com/mitchellh/zig-overlay. Apologies for the disturbance, this will be addressed as soon as possible."
-    builtins.foldl' nixpkgs.lib.recursiveUpdate {} (
-      builtins.map
-      (
-        system: let
-          pkgs = nixpkgs.legacyPackages.${system};
-          zig = zig-overlay.packages.${system}.master;
-          gitignoreSource = gitignore.lib.gitignoreSource;
-          target = builtins.replaceStrings ["darwin"] ["macos"] system;
-          revision = self;
-        in {
-          formatter.${system} = pkgs.alejandra;
-          packages.${system} = rec {
-            default = zls;
-            zls = pkgs.stdenvNoCC.mkDerivation {
-              name = "zls";
-              version = "master";
-              meta.mainProgram = "zls";
-              src = gitignoreSource ./.;
-              nativeBuildInputs = [zig];
-              dontInstall = true;
-              doCheck = true;
-              configurePhase = ''
-                export ZIG_GLOBAL_CACHE_DIR=$TEMP/.cache
-              '';
-              buildPhase = ''
-                PACKAGE_DIR=${pkgs.callPackage ./deps.nix {}}
-                zig build install --system $PACKAGE_DIR -Dtarget=${target} -Doptimize=ReleaseSafe --color off --prefix $out
-              '';
-              checkPhase = ''
-                zig build test --system $PACKAGE_DIR -Dtarget=${target} --color off
-              '';
-            };
-          };
-        }
-      )
-      ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"]
-    );
+    ...
+  }: let
+    forAllSystems = f: builtins.mapAttrs f nixpkgs.legacyPackages;
+  in {
+    formatter = forAllSystems (system: pkgs: pkgs.alejandra);
+
+    packages = forAllSystems (system: pkgs: {
+      default = zig.packages.${system}.zig_0_15_1.makePackage {
+        pname = "zls";
+        version = "0.15.1";
+        meta.mainProgram = "zls";
+        src = gitignore.lib.gitignoreSource ./.;
+        doCheck = true;
+        zigReleaseMode = "safe";
+        depsHash = "sha256-ji4qpx3WEEIaW8/Ps5uNJHvMEA+tl6wWj3dZx0RWQpo=";
+      };
+    });
+  };
 }