From 6b2f93bd85f7f9fbdc3c299c9e4dde9161643f96 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 9 Apr 2025 23:05:25 -0700 Subject: [PATCH] zig_0_11: drop --- pkgs/development/compilers/zig/default.nix | 4 ---- pkgs/development/compilers/zig/generic.nix | 2 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index ba6db99f5f8b..037e5e2d735a 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -9,10 +9,6 @@ }: let versions = { - "0.11.0" = { - llvmPackages = llvmPackages_16; - hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I="; - }; "0.12.1" = { llvmPackages = llvmPackages_17; hash = "sha256-C56jyVf16Co/XCloMLSRsbG9r/gBc8mzCdeEMHV2T2s="; diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 71b31b74df23..b7a3c7694743 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -175,8 +175,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members; mainProgram = "zig"; - # docgen fails to build - broken = version == "0.11.0"; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1a578c9a45bb..d7a2edb877ba 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1895,6 +1895,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 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 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 zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 202a94078f8a..f7b039785a7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11541,13 +11541,11 @@ with pkgs; (rec { zigPackages = recurseIntoAttrs (callPackage ../development/compilers/zig { }); - 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_14