jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zig: 0.11 -> 0.12 (#306077)

Browse Source 
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: Weijia Wang (wegank) <contact@weijia.wang>
This commit is contained in:
Felix Uhl 2024-05-02 19:58:52 +02:00 committed by GitHub
parent e993524725
commit 4c704748b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/hooks/zig.section.md
View File

@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases.
```nix ```nix
{ lib { lib
, stdenv , stdenv
, zig_0_11 , zig
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
# . . . # . . .
nativeBuildInputs = [ nativeBuildInputs = [
zig_0_11.hook zig.hook
]; ];
zigBuildFlags = [ "-Dman-pages=true" ]; zigBuildFlags = [ "-Dman-pages=true" ];

6
pkgs/tools/misc/clipbuzz/default.nix
View File

@ -3,7 +3,7 @@
, fetchzip , fetchzip
, libX11 , libX11
, libXfixes , libXfixes
, zig_0_11 , zig
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -15,14 +15,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-2//IwthAjGyVSZaXjgpM1pUJGYWZVkrJ6JyrVbzOtr8="; hash = "sha256-2//IwthAjGyVSZaXjgpM1pUJGYWZVkrJ6JyrVbzOtr8=";
}; };
nativeBuildInputs = [ zig_0_11.hook ]; nativeBuildInputs = [ zig.hook ];
buildInputs = [ buildInputs = [
libX11 libX11
libXfixes libXfixes
]; ];
meta = { meta = {
description = "Buzz on new X11 clipboard events"; description = "Buzz on new X11 clipboard events";
homepage = "https://trong.loang.net/~cnx/clipbuzz"; homepage = "https://trong.loang.net/~cnx/clipbuzz";
license = lib.licenses.unlicense; license = lib.licenses.unlicense;

15
pkgs/top-level/all-packages.nix
View File

@ -14763,7 +14763,9 @@ with pkgs;
clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; 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 { }; xclip = callPackage ../tools/misc/xclip { };
@ -16762,6 +16764,7 @@ with pkgs;
}; };
cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { };
cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { cargo-lambda = callPackage ../development/tools/rust/cargo-lambda {
zig = zig_0_12;
inherit (darwin.apple_sdk.frameworks) CoreServices Security; inherit (darwin.apple_sdk.frameworks) CoreServices Security;
}; };
cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; 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-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 { }; cauwugo = callPackage ../development/tools/rust/cauwugo { };
@ -20208,6 +20213,10 @@ with pkgs;
babl = callPackage ../development/libraries/babl { }; 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 { }; backward-cpp = callPackage ../development/libraries/backward-cpp { };
bamf = callPackage ../development/libraries/bamf { }; 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 { zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12.nix {
llvmPackages = llvmPackages_17; llvmPackages = llvmPackages_17;
}; };
zig = zig_0_11; zig = zig_0_12;
zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { }; zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { };