From 70c8c6bdbd3f2fc33e66b6cc895b78f8c443351b Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 21:27:38 +0100 Subject: [PATCH 1/4] clipbuzz: drop --- pkgs/tools/misc/clipbuzz/default.nix | 33 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/tools/misc/clipbuzz/default.nix diff --git a/pkgs/tools/misc/clipbuzz/default.nix b/pkgs/tools/misc/clipbuzz/default.nix deleted file mode 100644 index 8b09430b52aeb..0000000000000 --- a/pkgs/tools/misc/clipbuzz/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - libX11, - libXfixes, - zig, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "clipbuzz"; - version = "2.0.1"; - - src = fetchzip { - url = "https://trong.loang.net/~cnx/clipbuzz/snapshot/clipbuzz-${finalAttrs.version}.tar.gz"; - hash = "sha256-2//IwthAjGyVSZaXjgpM1pUJGYWZVkrJ6JyrVbzOtr8="; - }; - - nativeBuildInputs = [ zig.hook ]; - - buildInputs = [ - libX11 - libXfixes - ]; - - meta = { - description = "Buzz on new X11 clipboard events"; - homepage = "https://trong.loang.net/~cnx/clipbuzz"; - license = lib.licenses.unlicense; - maintainers = [ lib.maintainers.McSinyx ]; - mainProgram = "clipbuzz"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e399b3a5f936a..e50af8e09146d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -457,6 +457,7 @@ mapAliases { clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05 clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05 cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05 + clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10eb1c12d1ae4..9e6778a81ed36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4580,10 +4580,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - clipbuzz = callPackage ../tools/misc/clipbuzz { - zig = buildPackages.zig_0_12; - }; - # A minimal xar is needed to break an infinite recursion between macfuse-stubs and xar. # It is also needed to reduce the amount of unnecessary stuff in the Darwin bootstrap. xarMinimal = callPackage ../by-name/xa/xar/package.nix { e2fsprogs = null; }; From e0216a9c71ec873d369c59fa4e48c0ec80b1201c Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 21:27:38 +0100 Subject: [PATCH 2/4] dt: bump to Zig 0.13 --- pkgs/by-name/dt/dt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dt/dt/package.nix b/pkgs/by-name/dt/dt/package.nix index aaa9070bf69b5..3a4e6da36c358 100644 --- a/pkgs/by-name/dt/dt/package.nix +++ b/pkgs/by-name/dt/dt/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, testers, - zig_0_12, + zig_0_13, }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-pfTlOMJpOPbXZaJJvOKDUyCZxFHNLRRUteJFWT9IKOU="; }; - nativeBuildInputs = [ zig_0_12.hook ]; + nativeBuildInputs = [ zig_0_13.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; From 5db9f627f753135e818ef26576677e2d86befd73 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 21:27:38 +0100 Subject: [PATCH 3/4] cyber: drop There are PRs upstream to support newer Zig versions, but no movement, and the author has no GitHub activity since December: * * --- pkgs/by-name/cy/cyber/package.nix | 40 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/by-name/cy/cyber/package.nix diff --git a/pkgs/by-name/cy/cyber/package.nix b/pkgs/by-name/cy/cyber/package.nix deleted file mode 100644 index a2e219ef6f2e9..0000000000000 --- a/pkgs/by-name/cy/cyber/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - zig_0_12, -}: - -stdenv.mkDerivation rec { - pname = "cyber"; - version = "0-unstable-2025-12-10"; - - src = fetchFromGitHub { - owner = "fubark"; - repo = "cyber"; - rev = "2a2298d6aa12f9136b18cd85965f4a58e484f506"; - hash = "sha256-d81z+wUIQ/KUVa+GyXbT+E8dsG8Mdt1hZW1Qe1mmAiw="; - }; - - nativeBuildInputs = [ - zig_0_12.hook - ]; - - zigBuildFlags = [ - "cli" - ]; - - env = { - COMMIT = lib.substring 0 7 src.rev; - }; - - meta = with lib; { - description = "Fast, efficient, and concurrent scripting language"; - mainProgram = "cyber"; - homepage = "https://github.com/fubark/cyber"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - inherit (zig_0_12.meta) platforms; - broken = stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e50af8e09146d..a3979b3905836 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -502,6 +502,7 @@ mapAliases { cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 + cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 # these are for convenience, not for backward compat and shouldn't expire clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08 From ba90f3c54c63b5c4232644ba6e7564a6021d4237 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 9 Aug 2025 21:27:38 +0100 Subject: [PATCH 4/4] zig_0_12: drop --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/development/compilers/zig/default.nix | 5 ---- pkgs/development/compilers/zig/generic.nix | 31 +++++----------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 145185bdf26ed..c700b68dbf6b8 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -38,6 +38,8 @@ - `conftest` since `0.60.0` has moved to use rego `v1` as default. To continue using `v0` use `--rego-version v0`. For more information about upgrading to Rego v1 syntax, see the [upstream docs](https://www.openpolicyagent.org/docs/latest/v0-upgrade/). +- Zig 0.12 has been removed. + - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index e1df722f90717..e0d9f82bebffc 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,17 +1,12 @@ { lib, callPackage, - llvmPackages_17, llvmPackages_18, llvmPackages_19, zigVersions ? { }, }: let versions = { - "0.12.1" = { - llvmPackages = llvmPackages_17; - hash = "sha256-C56jyVf16Co/XCloMLSRsbG9r/gBc8mzCdeEMHV2T2s="; - }; "0.13.0" = { llvmPackages = llvmPackages_18; hash = "sha256-5qSiTq+UWGOwjDVZMIrAt2cDKHkyNPBSAEjpRQUByFM="; diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 6d061e310d3f1..a7ad51f83ab57 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -81,18 +81,11 @@ stdenv.mkDerivation (finalAttrs: { export ZIG_GLOBAL_CACHE_DIR="$TMPDIR/zig-cache"; ''; - # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't - # work in Nix's sandbox. Use env from our coreutils instead. postPatch = - let - zigSystemPath = - if lib.versionAtLeast finalAttrs.version "0.12" then - "lib/std/zig/system.zig" - else - "lib/std/zig/system/NativeTargetInfo.zig"; - in + # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't + # work in Nix's sandbox. Use env from our coreutils instead. '' - substituteInPlace ${zigSystemPath} \ + substituteInPlace lib/std/zig/system.zig \ --replace-fail "/usr/bin/env" "${lib.getExe' coreutils "env"}" '' # Zig tries to access xcrun and xcode-select at the absolute system path to query the macOS SDK @@ -112,24 +105,14 @@ stdenv.mkDerivation (finalAttrs: { '' 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 - '' else '' - stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig + stage3/bin/zig build langref ''; - postInstall = - if lib.versionAtLeast finalAttrs.version "0.13" then - '' - install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html - '' - else - '' - install -Dm444 langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html - ''; + postInstall = '' + install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html + ''; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a3979b3905836..e9ea0bee18e3d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2267,6 +2267,7 @@ mapAliases { 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_11 = throw "zig 0.11 has been removed, upgrade to a newer version instead"; # Added 2025-04-09 + zig_0_12 = throw "zig 0.12 has been removed, upgrade to a newer version instead"; # Added 2025-08-18 zigbee2mqtt_1 = throw "Zigbee2MQTT 1.x has been removed, upgrade to the unversioned attribute."; # Added 2025-08-11 zigbee2mqtt_2 = zigbee2mqtt; # Added 2025-08-11 zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e6778a81ed36..0a09bcb5a7e21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9521,12 +9521,10 @@ with pkgs; (rec { zigPackages = recurseIntoAttrs (callPackage ../development/compilers/zig { }); - zig_0_12 = zigPackages."0.12"; zig_0_13 = zigPackages."0.13"; zig_0_14 = zigPackages."0.14"; }) zigPackages - zig_0_12 zig_0_13 zig_0_14 ;