Unverified Commit 4c704748 authored by Felix Uhl's avatar Felix Uhl Committed by GitHub
Browse files

zig: 0.11 -> 0.12 (#306077) 



This upgrades the default version of zig to zig_0_12, which builds
reproducibly on darwin.

Fixes #299091.

Also upgrades all packages compatible with zig 0.12 to that version.
I tried to upgrade packages currently pinning 0.11 as well, but only a
few worked.

Co-authored-by: default avatarWeijia Wang (wegank) <contact@weijia.wang>
parent e9935247

doc/hooks/zig.section.md

+2 −2
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. 
```nix

{ lib

, stdenv

, zig_0_11

, zig

}:



stdenv.mkDerivation {

  # . . .



  nativeBuildInputs = [

    zig_0_11.hook

    zig.hook

  ];



  zigBuildFlags = [ "-Dman-pages=true" ];

pkgs/tools/misc/clipbuzz/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, fetchzip

, libX11

, libXfixes

, zig_0_11

, zig

}:



stdenv.mkDerivation (finalAttrs: {
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-2//IwthAjGyVSZaXjgpM1pUJGYWZVkrJ6JyrVbzOtr8=";

  };



  nativeBuildInputs = [ zig_0_11.hook ];

  nativeBuildInputs = [ zig.hook ];



  buildInputs = [

    libX11

pkgs/top-level/all-packages.nix

+12 −3
Original line number Diff line number Diff line
@@ -14763,7 +14763,9 @@ with pkgs; 














  clipboard-jh = callPackage ../tools/misc/clipboard-jh { };



























  clipbuzz = callPackage ../tools/misc/clipbuzz { };













  clipbuzz = callPackage ../tools/misc/clipbuzz {













    zig = zig_0_12;













  };





























  xclip = callPackage ../tools/misc/xclip { };
























@@ -16762,6 +16764,7 @@ with pkgs;













  };















  cargo-insta = callPackage ../development/tools/rust/cargo-insta { };















  cargo-lambda = callPackage ../development/tools/rust/cargo-lambda {













    zig = zig_0_12;















    inherit (darwin.apple_sdk.frameworks) CoreServices Security;















  };















  cargo-limit = callPackage ../development/tools/rust/cargo-limit { };










@@ -16834,7 +16837,9 @@ with pkgs;



























  cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { };



























  cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { };













  cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild {













    zig = zig_0_12;













  };





























  cauwugo = callPackage ../development/tools/rust/cauwugo { };
























@@ -20208,6 +20213,10 @@ with pkgs;



























  babl = callPackage ../development/libraries/babl { };



























  backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix {













    zig = zig_0_11;













  };



























  backward-cpp = callPackage ../development/libraries/backward-cpp { };





























  bamf = callPackage ../development/libraries/bamf { };










@@ -25167,7 +25176,7 @@ with pkgs;













  zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12.nix {















    llvmPackages = llvmPackages_17;















  };













  zig = zig_0_11;













  zig = zig_0_12;





























  zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { };