Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/release-notes/rl-2511.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
40 changes: 0 additions & 40 deletions pkgs/by-name/cy/cyber/package.nix

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/by-name/dt/dt/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
testers,
zig_0_12,
zig_0_13,
}:

stdenv.mkDerivation (finalAttrs: {
Expand All @@ -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; };

Expand Down
5 changes: 0 additions & 5 deletions pkgs/development/compilers/zig/default.nix
Original file line number Diff line number Diff line change
@@ -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=";
Expand Down
31 changes: 7 additions & 24 deletions pkgs/development/compilers/zig/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 = ''
Expand Down
33 changes: 0 additions & 33 deletions pkgs/tools/misc/clipbuzz/default.nix

This file was deleted.

3 changes: 3 additions & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -501,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
Expand Down Expand Up @@ -2265,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
Expand Down
6 changes: 0 additions & 6 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down Expand Up @@ -9525,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
;
Expand Down
Loading