remove custom zig and zls builds

input-output-hk · May 8, 2024 · 3293779 · 3293779
1 parent 8f25396
commit 3293779
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 62 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11;
+    nixpkgs.url = github:NixOS/nixpkgs/nixpkgs-unstable;
     nix = {
       url = github:NixOS/nix/2.19-maintenance;
       inputs.nixpkgs.follows = "nixpkgs";
@@ -37,10 +37,9 @@
         config,
         ...
       }: {
-        _module.args.pkgs = inputs'.nixpkgs.legacyPackages.appendOverlays [
-          (_final: _prev: {inherit (config.packages) zig;})
-          parts.config.flake.overlays.zig
-        ];
+        _module.args.pkgs =
+          inputs'.nixpkgs.legacyPackages.extend
+          parts.config.flake.overlays.zig;
       };
     });
 }
diff --git a/nix/devShells.nix b/nix/devShells.nix
@@ -14,7 +14,7 @@
       default = pkgs.mkShell {
         name = "devShell";
         packages = with pkgs; [
-          config.packages.zls
+          zls
           wasm-tools
         ];
         inputsFrom = [

diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./cizero
-    ./zig
   ];
 
   perSystem = {

diff --git a/nix/packages/zig/default.nix b/nix/packages/zig/default.nix