update flake to working 0.12 and add zls

ZigEmbeddedGroup · Apr 26, 2024 · c1d82f7 · c1d82f7
1 parent 540a525
commit c1d82f7
Show file tree

Hide file tree

Showing 3 changed files with 178 additions and 13 deletions.
diff --git a/.envrc b/.envrc
@@ -1,2 +1,3 @@
-# use_nix
-use_flake
+if has nix; then
+  use flake
+fi
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,6 +8,9 @@
     # required for latest zig
     zig.url = "github:mitchellh/zig-overlay";
 
+    zls.url = "github:zigtools/zls";
+
+
     # Used for shell.nix
     flake-compat = {
       url = github:edolstra/flake-compat;
@@ -26,6 +29,7 @@
         # Other overlays
         (final: prev: {
           zigpkgs = inputs.zig.packages.${prev.system};
+          zls = inputs.zls.packages.${prev.system}.zls;
         })
       ];
 
@@ -84,7 +88,8 @@
       rec {
         devShells.default = pkgs.mkShell {
           nativeBuildInputs = [
-            pkgs.zigpkgs."0.11.0"
+            pkgs.zigpkgs."0.12.0"
+            pkgs.zls
             (python3.withPackages (ps: [
               ps.dataclasses_json
               ps.marshmallow