Skip to content

Commit 2c75094

Browse files
committed
block zig-flake and using zig-overlay
not compat with zls's flake waiting zigtools/zls#2457 to merge Signed-off-by: Pui Yong Qing <[email protected]>
1 parent 6325971 commit 2c75094

File tree

3 files changed

+91
-85
lines changed

3 files changed

+91
-85
lines changed

flake.lock

Lines changed: 84 additions & 83 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
url = "github:ghostty-org/ghostty";
1818
inputs.nixpkgs.follows = "nixpkgs";
1919
inputs.zig.follows = "zig";
20+
inputs.zon2nix.follows = "zon2nix";
2021
};
2122

2223
zon2nix = {
@@ -25,7 +26,9 @@
2526
};
2627

2728
zig = {
28-
url = "github:silversquirl/zig-flake/4ce776e231ed72daee11a4d33459834517e0f3e4"; # 20250920 compat with zls
29+
#block untill https://github.com/zigtools/zls/pull/2457 merged
30+
#url = "github:silversquirl/zig-flake";
31+
url = "github:mitchellh/zig-overlay";
2932
inputs.nixpkgs.follows = "nixpkgs";
3033
};
3134

@@ -54,6 +57,7 @@
5457
agenix = {
5558
url = "github:yaxitech/ragenix";
5659
inputs.nixpkgs.follows = "nixpkgs";
60+
inputs.rust-overlay.follows = "rust-overlay";
5761
};
5862

5963
mysecrets = {

modules/core/packages.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@
105105
pkg-config # Wrapper Script For Allowing Packages To Get Info On Others
106106
playerctl # Allows Changing Media Volume Through Scripts
107107
ripgrep # Improved Grep
108-
inputs.zig.packages.${system}.nightly
108+
zigpkgs.master
109+
#inputs.zig.packages.${system}.nightly block until https://github.com/zigtools/zls/pull/2457 merged
109110
(rust-bin.selectLatestNightlyWith (
110111
toolchain:
111112
toolchain.default.override {

0 commit comments

Comments
 (0)