From 3ba4864f6cbbc80fdea01cd77fb0607a6ad6d4b4 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 7 Mar 2025 11:46:30 -0600 Subject: [PATCH] core: update zig2nix to use explicit Zig version from Nix This will avoid build breakage in the near future as Zig 0.14 is coming to Nix. --- build.zig.zon.nix | 4 ++-- flake.lock | 8 ++++---- flake.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.zig.zon.nix b/build.zig.zon.nix index cc1940d15..758166de0 100644 --- a/build.zig.zon.nix +++ b/build.zig.zon.nix @@ -5,7 +5,7 @@ fetchurl, fetchgit, runCommandLocal, - zig, + zig_0_13, name ? "zig-packages", }: with builtins; @@ -16,7 +16,7 @@ with lib; let }: runCommandLocal name { - nativeBuildInputs = [zig]; + nativeBuildInputs = [zig_0_13]; } '' hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" diff --git a/flake.lock b/flake.lock index 7905635b3..1faef3308 100644 --- a/flake.lock +++ b/flake.lock @@ -125,16 +125,16 @@ ] }, "locked": { - "lastModified": 1738263917, - "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=", + "lastModified": 1741368279, + "narHash": "sha256-WTaC8HmnIq6O71iK0g9as404BbmS+YyEP5qS85m2JBY=", "owner": "jcollie", "repo": "zig2nix", - "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "rev": "672971b5b6911de21446ad4fc76dee677922eda0", "type": "github" }, "original": { "owner": "jcollie", - "ref": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "ref": "672971b5b6911de21446ad4fc76dee677922eda0", "repo": "zig2nix", "type": "github" } diff --git a/flake.nix b/flake.nix index df0eeb759..d1be42b15 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ }; zig2nix = { - url = "github:jcollie/zig2nix?ref=c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a"; + url = "github:jcollie/zig2nix?ref=672971b5b6911de21446ad4fc76dee677922eda0"; inputs = { nixpkgs.follows = "nixpkgs-stable"; flake-utils.follows = "flake-utils";