zig: 0.13 -> 0.14 (#387154)
This commit is contained in:
@@ -31,7 +31,11 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
|
||||
ln -s ${
|
||||
callPackage ./deps.nix {
|
||||
zig = zig_0_12;
|
||||
}
|
||||
} $ZIG_GLOBAL_CACHE_DIR/p
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) ly; };
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
stdenv,
|
||||
zig,
|
||||
zig_0_13,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig ]}
|
||||
wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig_0_13 ]}
|
||||
'';
|
||||
|
||||
CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)";
|
||||
|
||||
@@ -17,7 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs=";
|
||||
};
|
||||
postPatch = ''
|
||||
ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
|
||||
ln -s ${
|
||||
callPackage ./build.zig.zon.nix {
|
||||
zig = zig_0_13;
|
||||
}
|
||||
} $ZIG_GLOBAL_CACHE_DIR/p
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
deps = callPackage ./deps.nix {
|
||||
name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
|
||||
zig = zig_0_13;
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
zig,
|
||||
zig_0_13,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
zig.hook
|
||||
zig_0_13.hook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -37,7 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-4ac0LGQtLldHyXJ2GIRMHV+VZfUrRFdBYLiAHX5lWcw=";
|
||||
};
|
||||
|
||||
deps = callPackage ./build.zig.zon.nix { };
|
||||
deps = callPackage ./build.zig.zon.nix {
|
||||
zig = zig_0_13;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
zig,
|
||||
zig_0_13,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "superhtml";
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
zig.hook
|
||||
zig_0_13.hook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -26,7 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-jfMSar+Y3inu1Cly6rIDw+akBJIQ6huL0smAstgQmEo=";
|
||||
};
|
||||
|
||||
deps = callPackage ./build.zig.zon.nix { };
|
||||
deps = callPackage ./build.zig.zon.nix {
|
||||
zig = zig_0_13;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
llvmPackages_16,
|
||||
llvmPackages_17,
|
||||
llvmPackages_18,
|
||||
llvmPackages_19,
|
||||
zigVersions ? { },
|
||||
}:
|
||||
let
|
||||
@@ -20,6 +21,10 @@ let
|
||||
llvmPackages = llvmPackages_18;
|
||||
hash = "sha256-5qSiTq+UWGOwjDVZMIrAt2cDKHkyNPBSAEjpRQUByFM=";
|
||||
};
|
||||
"0.14.0" = {
|
||||
llvmPackages = llvmPackages_19;
|
||||
hash = "sha256-VyteIp5ZRt6qNcZR68KmM7CvN2GYf8vj5hP+gHLkuVk=";
|
||||
};
|
||||
} // zigVersions;
|
||||
|
||||
mkPackage =
|
||||
|
||||
@@ -111,7 +111,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
postBuild =
|
||||
if lib.versionAtLeast finalAttrs.version "0.13" then
|
||||
if lib.versionAtLeast finalAttrs.version "0.14" then
|
||||
''
|
||||
stage3/bin/zig build langref --zig-lib-dir $(pwd)/stage3/lib/zig
|
||||
''
|
||||
else if lib.versionAtLeast finalAttrs.version "0.13" then
|
||||
''
|
||||
stage3/bin/zig build langref
|
||||
''
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchurl,
|
||||
ncurses,
|
||||
pkg-config,
|
||||
zig,
|
||||
zig_0_13,
|
||||
zstd,
|
||||
installShellFiles,
|
||||
testers,
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
zig.hook
|
||||
zig_0_13.hook
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pSub
|
||||
rodrgz
|
||||
];
|
||||
inherit (zig.meta) platforms;
|
||||
inherit (zig_0_13.meta) platforms;
|
||||
mainProgram = "ncdu";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10764,12 +10764,14 @@ with pkgs;
|
||||
zig_0_11 = zigPackages."0.11";
|
||||
zig_0_12 = zigPackages."0.12";
|
||||
zig_0_13 = zigPackages."0.13";
|
||||
zig_0_14 = zigPackages."0.14";
|
||||
}) zigPackages
|
||||
zig_0_11
|
||||
zig_0_12
|
||||
zig_0_13;
|
||||
zig_0_13
|
||||
zig_0_14;
|
||||
|
||||
zig = zig_0_13;
|
||||
zig = zig_0_14;
|
||||
|
||||
zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user