From 59eb02116f61a70a8bdeb125329833133ef36a06 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 9 Aug 2023 20:55:18 -0400 Subject: [PATCH] treewide: use zig_0_11 instead of zig for zig packages Zig is still under active development, and new releases often introduce breaking changes. This makes updating the default version of zig easier. Some packages did not receive this change because they could be using the c compiler or linker of zig, which doesn't receive as much breaking changes compared to e.g. the zig std library. https://github.com/NixOS/nixpkgs/pull/248243#discussion_r1289401340 --- doc/hooks/zig.section.md | 4 ++-- pkgs/development/tools/language-servers/zls/default.nix | 4 ++-- pkgs/tools/misc/poop/default.nix | 4 ++-- pkgs/tools/text/dt/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md index d85bcfd5c757..483fd285f416 100644 --- a/doc/hooks/zig.section.md +++ b/doc/hooks/zig.section.md @@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. ```nix { lib , stdenv -, zig +, zig_0_11 }: stdenv.mkDerivation { # . . . nativeBuildInputs = [ - zig.hook + zig_0_11.hook ]; zigBuildFlags = [ "-Dman-pages=true" ]; diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 7e76942c1598..9fda43915ca2 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, zig +, zig_0_11 , callPackage }: @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - zig.hook + zig_0_11.hook ]; postPatch = '' diff --git a/pkgs/tools/misc/poop/default.nix b/pkgs/tools/misc/poop/default.nix index d07c2c150be3..fe595f76ffaa 100644 --- a/pkgs/tools/misc/poop/default.nix +++ b/pkgs/tools/misc/poop/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch -, zig +, zig_0_11 }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - zig.hook + zig_0_11.hook ]; meta = with lib; { diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index e4c6894050ff..8b892f6126ea 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , testers -, zig +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-C6sG8iqXs64x2AWCxKGFPyoXC1Fn4p2eSLWwJAQ8CSc="; }; - nativeBuildInputs = [ zig.hook ]; + nativeBuildInputs = [ zig_0_11.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.dt; };