From 4bcc8061b79a13430bda88c7a5cdc81bc1a670b4 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 17 Jul 2024 12:52:36 -0500 Subject: [PATCH] remove commit pinning for zls --- flake.lock | 14 ++++++-------- flake.nix | 5 ++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index f8cda30..5498777 100644 --- a/flake.lock +++ b/flake.lock @@ -1150,17 +1150,16 @@ ] }, "locked": { - "lastModified": 1720920089, - "narHash": "sha256-L6y1TI4caiJwKQBiBhU748F5Cv6563el0QOh6Zapk3s=", + "lastModified": 1721179336, + "narHash": "sha256-PPeGUDP5ZL8pnBRKRCBpBG9mYpun11QyGwmWD2orSIA=", "owner": "Cloudef", "repo": "zig2nix", - "rev": "b6655dcc31af1b20d4e112306c46c110ce5d967d", + "rev": "cf6d6a8d6db80370f61469fb682479bdadfad83f", "type": "github" }, "original": { "owner": "Cloudef", "repo": "zig2nix", - "rev": "b6655dcc31af1b20d4e112306c46c110ce5d967d", "type": "github" } }, @@ -1175,17 +1174,16 @@ "zig-overlay": "zig-overlay" }, "locked": { - "lastModified": 1720799773, - "narHash": "sha256-JeQuI0LLjCdI1zgHQu9n0tA3CEz8EZ0qHUFAYqWURA0=", + "lastModified": 1721153775, + "narHash": "sha256-kReih1LP5I9J0P+ByAOKNv/d4re0P/bH2AD6InGjN1U=", "owner": "zigtools", "repo": "zls", - "rev": "ef50085f7b7136c1e1b26438141bb005743f38c1", + "rev": "41dae221fab979b3764e9191d8126e09625b0bb2", "type": "github" }, "original": { "owner": "zigtools", "repo": "zls", - "rev": "ef50085f7b7136c1e1b26438141bb005743f38c1", "type": "github" } } diff --git a/flake.nix b/flake.nix index e94b795..c7ad736 100644 --- a/flake.nix +++ b/flake.nix @@ -26,13 +26,12 @@ hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland-contrib.url = "github:hyprwm/contrib"; - # revert to main after https://github.com/zigtools/zls/pull/1958 zig2nix = { - url = "github:Cloudef/zig2nix/b6655dcc31af1b20d4e112306c46c110ce5d967d"; + url = "github:Cloudef/zig2nix"; inputs.nixpkgs.follows = "nixpkgs"; }; zls = { - url = "github:zigtools/zls/ef50085f7b7136c1e1b26438141bb005743f38c1"; + url = "github:zigtools/zls"; inputs.nixpkgs.follows = "nixpkgs"; }; roc = {