diff --git a/pkgs/development/tools/zls/deps_0_15.nix b/pkgs/development/tools/zls/deps_0_15.nix index 2292e4212b6c..5e3f28ccc47a 100644 --- a/pkgs/development/tools/zls/deps_0_15.nix +++ b/pkgs/development/tools/zls/deps_0_15.nix @@ -1,4 +1,5 @@ # generated by zon2nix (https://github.com/nix-community/zon2nix) +# manually removed tracy as instructed here: https://github.com/zigtools/zls/blob/ce6c8f02c78e622421cfc2405c67c5222819ec03/build.zig.zon#L9-L13 { linkFarm, fetchzip }: @@ -10,13 +11,6 @@ linkFarm "zig-packages" [ hash = "sha256-y7Ck5XZNnHxmPPWlDAqZZ2g3n67txj5/Zq04AhuW5+M="; }; } - { - name = "N-V-__8AAMeOlQEipHjcyu0TCftdAi9AQe7EXUDJOoVe0k-t"; - path = fetchzip { - url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.11.1.tar.gz"; - hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8="; - }; - } { name = "known_folders-0.0.0-Fy-PJkfRAAAVdptXWXBspIIC7EkVgLgWozU5zIk5Zgcy"; path = fetchzip { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4839aa3a1d4..094b0bacb2cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9192,6 +9192,7 @@ with pkgs; zig_0_15 ; + # If this is updated, the default zls version should also be updated to match the default zig version. zig = zig_0_15; zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv; @@ -9202,7 +9203,7 @@ with pkgs; ; # This should be kept updated to ensure the default zls version matches the default zig version. - zls = zls_0_14; + zls = zls_0_15; libzint = zint-qt.override { withGUI = false; };