mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-14 05:29:20 +03:00
zig: drop 0.11, use ninja (#397597)
This commit is contained in:
commit
d2e95d833d
10 changed files with 66 additions and 45 deletions
|
@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
# Does not support zig 0.12 or newer, hasn't been updated in 2 years.
|
||||||
|
broken = lib.versionAtLeast zig.version "0.12";
|
||||||
description = "Automatically set screen brightness with a webcam";
|
description = "Automatically set screen brightness with a webcam";
|
||||||
mainProgram = "backlight-auto";
|
mainProgram = "backlight-auto";
|
||||||
homepage = "https://len.falken.directory/backlight-auto.html";
|
homepage = "https://len.falken.directory/backlight-auto.html";
|
||||||
|
|
|
@ -7,22 +7,47 @@
|
||||||
libGLU,
|
libGLU,
|
||||||
libsndfile,
|
libsndfile,
|
||||||
openal,
|
openal,
|
||||||
zig_0_11,
|
zig_0_14,
|
||||||
|
runCommand,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "blackshades";
|
pname = "blackshades";
|
||||||
version = "2.5.1";
|
version = "2.5.2-unstable-2025-03-12";
|
||||||
|
|
||||||
src = fetchFromSourcehut {
|
src = fetchFromSourcehut {
|
||||||
owner = "~cnx";
|
owner = "~cnx";
|
||||||
repo = "blackshades";
|
repo = "blackshades";
|
||||||
rev = finalAttrs.version;
|
rev = "a2fbe0e08bedbbbb1089dbb8f3e3cb4d76917bd0";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
hash = "sha256-qdpXpuXHr9w2XMfgOVveWv3JoqdJHVB8TCqZdyaw/DM=";
|
hash = "sha256-W6ltmWCw7jfiTiNlh60YVF7mz//8s+bgu4F9gy5cDgw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ zig_0_11.hook ];
|
postUnpack = ''
|
||||||
|
ln -s ${
|
||||||
|
runCommand "${finalAttrs.finalPackage.name}-zig-deps"
|
||||||
|
{
|
||||||
|
inherit (finalAttrs) src;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ zig_0_14 ];
|
||||||
|
|
||||||
|
outputHashAlgo = null;
|
||||||
|
outputHashMode = "recursive";
|
||||||
|
outputHash = "sha256-wBIfLeaKtTow2Z7gjEgIFmqcTGWgpRWI+k0t294BslM=";
|
||||||
|
}
|
||||||
|
''
|
||||||
|
export ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)
|
||||||
|
|
||||||
|
runHook unpackPhase
|
||||||
|
cd $sourceRoot
|
||||||
|
|
||||||
|
zig build --fetch
|
||||||
|
mv $ZIG_GLOBAL_CACHE_DIR/p $out
|
||||||
|
''
|
||||||
|
} $ZIG_GLOBAL_CACHE_DIR/p
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [ zig_0_14.hook ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glfw
|
glfw
|
||||||
|
|
|
@ -2,22 +2,22 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
zig_0_11,
|
zig_0_12,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cyber";
|
pname = "cyber";
|
||||||
version = "unstable-2023-09-19";
|
version = "0-unstable-2025-12-10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fubark";
|
owner = "fubark";
|
||||||
repo = "cyber";
|
repo = "cyber";
|
||||||
rev = "f95cd189cf090d26542a87b1d2ced461e75fa1a7";
|
rev = "2a2298d6aa12f9136b18cd85965f4a58e484f506";
|
||||||
hash = "sha256-ctEd8doXMKq3L9/T+jOcWqlBQN0pVhsu9DjBXsg/u/4=";
|
hash = "sha256-d81z+wUIQ/KUVa+GyXbT+E8dsG8Mdt1hZW1Qe1mmAiw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
zig_0_11.hook
|
zig_0_12.hook
|
||||||
];
|
];
|
||||||
|
|
||||||
zigBuildFlags = [
|
zigBuildFlags = [
|
||||||
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://github.com/fubark/cyber";
|
homepage = "https://github.com/fubark/cyber";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ figsoda ];
|
maintainers = with maintainers; [ figsoda ];
|
||||||
inherit (zig_0_11.meta) platforms;
|
inherit (zig_0_12.meta) platforms;
|
||||||
broken = stdenv.hostPlatform.isDarwin;
|
broken = stdenv.hostPlatform.isDarwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,21 +3,21 @@
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
testers,
|
testers,
|
||||||
zig_0_11,
|
zig_0_12,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "dt";
|
pname = "dt";
|
||||||
version = "1.3.1";
|
version = "1.3.1-unstable-2024-07-16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "so-dang-cool";
|
owner = "so-dang-cool";
|
||||||
repo = "dt";
|
repo = "dt";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "0d16ca2867131e99a93a412231465cf68f2e594f";
|
||||||
hash = "sha256-qHfvHf4T0wWnzqp5FfLg7n7te24xc2aMEdTK3Iia8Q0=";
|
hash = "sha256-pfTlOMJpOPbXZaJJvOKDUyCZxFHNLRRUteJFWT9IKOU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ zig_0_11.hook ];
|
nativeBuildInputs = [ zig_0_12.hook ];
|
||||||
|
|
||||||
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||||
|
|
||||||
|
@ -37,7 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
In short, dt is intended to be generally useful, with zero pretense of
|
In short, dt is intended to be generally useful, with zero pretense of
|
||||||
elegance.
|
elegance.
|
||||||
'';
|
'';
|
||||||
changelog = "https://github.com/so-dang-cool/dt/releases/tag/v${finalAttrs.version}";
|
# TODO: uncomment when dt pushes a new release
|
||||||
|
# changelog = "https://github.com/so-dang-cool/dt/releases/tag/v${finalAttrs.version}";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = with lib.maintainers; [ booniepepper ];
|
maintainers = with lib.maintainers; [ booniepepper ];
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
|
|
|
@ -3,11 +3,8 @@
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
testers,
|
testers,
|
||||||
zig_0_11,
|
zig,
|
||||||
}:
|
}:
|
||||||
let
|
|
||||||
zig = zig_0_11;
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "findup";
|
pname = "findup";
|
||||||
version = "1.1.2";
|
version = "1.1.2";
|
||||||
|
@ -24,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
# Doesn't support zig 0.12 or newer, last commit was 2 years ago.
|
||||||
|
broken = lib.versionAtLeast zig.version "0.12";
|
||||||
homepage = "https://github.com/booniepepper/findup";
|
homepage = "https://github.com/booniepepper/findup";
|
||||||
description = "Search parent directories for sentinel files";
|
description = "Search parent directories for sentinel files";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
|
|
|
@ -2,23 +2,23 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
zig_0_11,
|
zig_0_14,
|
||||||
nix,
|
nix,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "zon2nix";
|
pname = "zon2nix";
|
||||||
version = "0.1.2";
|
version = "0.1.3-unstable-2025-03-20";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nix-community";
|
owner = "nix-community";
|
||||||
repo = "zon2nix";
|
repo = "zon2nix";
|
||||||
rev = "v${version}";
|
rev = "2360e358c2107860dadd340f88b25d260b538188";
|
||||||
hash = "sha256-pS0D+wdebtpNaGpDee9aBwEKTDvNU56VXer9uzULXcM=";
|
hash = "sha256-89hYzrzQokQ+HUOd3g4epP9jdajaIoaMG81SrCNCqqU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
zig_0_11.hook
|
zig_0_14.hook
|
||||||
];
|
];
|
||||||
|
|
||||||
zigBuildFlags = [
|
zigBuildFlags = [
|
||||||
|
@ -29,13 +29,16 @@ stdenv.mkDerivation rec {
|
||||||
"-Dnix=${lib.getExe nix}"
|
"-Dnix=${lib.getExe nix}"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Convert the dependencies in `build.zig.zon` to a Nix expression";
|
description = "Convert the dependencies in `build.zig.zon` to a Nix expression";
|
||||||
mainProgram = "zon2nix";
|
mainProgram = "zon2nix";
|
||||||
homepage = "https://github.com/nix-community/zon2nix";
|
homepage = "https://github.com/nix-community/zon2nix";
|
||||||
changelog = "https://github.com/nix-community/zon2nix/blob/${src.rev}/CHANGELOG.md";
|
changelog = "https://github.com/nix-community/zon2nix/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||||
license = licenses.mpl20;
|
license = lib.licenses.mpl20;
|
||||||
maintainers = with maintainers; [ figsoda ];
|
maintainers = with lib.maintainers; [
|
||||||
inherit (zig_0_11.meta) platforms;
|
figsoda
|
||||||
|
RossComputerGuy
|
||||||
|
];
|
||||||
|
inherit (zig_0_14.meta) platforms;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -9,10 +9,6 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
versions = {
|
versions = {
|
||||||
"0.11.0" = {
|
|
||||||
llvmPackages = llvmPackages_16;
|
|
||||||
hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I=";
|
|
||||||
};
|
|
||||||
"0.12.1" = {
|
"0.12.1" = {
|
||||||
llvmPackages = llvmPackages_17;
|
llvmPackages = llvmPackages_17;
|
||||||
hash = "sha256-C56jyVf16Co/XCloMLSRsbG9r/gBc8mzCdeEMHV2T2s=";
|
hash = "sha256-C56jyVf16Co/XCloMLSRsbG9r/gBc8mzCdeEMHV2T2s=";
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
xcbuild,
|
xcbuild,
|
||||||
targetPackages,
|
targetPackages,
|
||||||
libxml2,
|
libxml2,
|
||||||
|
ninja,
|
||||||
zlib,
|
zlib,
|
||||||
coreutils,
|
coreutils,
|
||||||
callPackage,
|
callPackage,
|
||||||
|
@ -35,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
[
|
[
|
||||||
cmake
|
cmake
|
||||||
(lib.getDev llvmPackages.llvm.dev)
|
(lib.getDev llvmPackages.llvm.dev)
|
||||||
|
ninja
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
# provides xcode-select, which is required for SDK detection
|
# provides xcode-select, which is required for SDK detection
|
||||||
|
@ -173,8 +175,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
|
maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
|
||||||
mainProgram = "zig";
|
mainProgram = "zig";
|
||||||
# docgen fails to build
|
|
||||||
broken = version == "0.11.0";
|
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -1929,6 +1929,7 @@ mapAliases {
|
||||||
zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
|
zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
|
||||||
zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
|
zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
|
||||||
zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
|
zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
|
||||||
|
zig_0_11 = throw "zig 0.11 has been removed, upgrade to a newer version instead"; # Added 2025-04-09
|
||||||
zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07
|
zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07
|
||||||
zinc = zincsearch; # Added 2023-05-28
|
zinc = zincsearch; # Added 2023-05-28
|
||||||
zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
|
zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
|
||||||
|
|
|
@ -8981,10 +8981,6 @@ with pkgs;
|
||||||
|
|
||||||
aws-spend-summary = haskellPackages.aws-spend-summary.bin;
|
aws-spend-summary = haskellPackages.aws-spend-summary.bin;
|
||||||
|
|
||||||
backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix {
|
|
||||||
zig = buildPackages.zig_0_11;
|
|
||||||
};
|
|
||||||
|
|
||||||
inherit (callPackages ../development/libraries/bashup-events { }) bashup-events32 bashup-events44;
|
inherit (callPackages ../development/libraries/bashup-events { }) bashup-events32 bashup-events44;
|
||||||
|
|
||||||
bc-soci = callPackage ../development/libraries/soci/bc-soci.nix { };
|
bc-soci = callPackage ../development/libraries/soci/bc-soci.nix { };
|
||||||
|
@ -11470,13 +11466,11 @@ with pkgs;
|
||||||
(rec {
|
(rec {
|
||||||
zigPackages = recurseIntoAttrs (callPackage ../development/compilers/zig { });
|
zigPackages = recurseIntoAttrs (callPackage ../development/compilers/zig { });
|
||||||
|
|
||||||
zig_0_11 = zigPackages."0.11";
|
|
||||||
zig_0_12 = zigPackages."0.12";
|
zig_0_12 = zigPackages."0.12";
|
||||||
zig_0_13 = zigPackages."0.13";
|
zig_0_13 = zigPackages."0.13";
|
||||||
zig_0_14 = zigPackages."0.14";
|
zig_0_14 = zigPackages."0.14";
|
||||||
})
|
})
|
||||||
zigPackages
|
zigPackages
|
||||||
zig_0_11
|
|
||||||
zig_0_12
|
zig_0_12
|
||||||
zig_0_13
|
zig_0_13
|
||||||
zig_0_14
|
zig_0_14
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue