From 2c3bb1389e6359c76f5ecc3b9e16b7c804d7f3ea Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 15 May 2025 09:25:49 +0200 Subject: [PATCH] varnish76: drop will be EOL within 25.05 support window --- nixos/tests/all-tests.nix | 4 ---- pkgs/servers/varnish/default.nix | 5 ----- pkgs/servers/varnish/modules.nix | 4 ---- pkgs/servers/varnish/packages.nix | 5 ----- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 insertions(+), 20 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 805b77bf7a96..ab914de71f38 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1424,10 +1424,6 @@ in imports = [ ./varnish.nix ]; _module.args.package = pkgs.varnish60; }; - varnish76 = runTest { - imports = [ ./varnish.nix ]; - _module.args.package = pkgs.varnish76; - }; varnish77 = runTest { imports = [ ./varnish.nix ]; _module.args.package = pkgs.varnish77; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index b7ab2683d681..b496c0569d79 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -94,11 +94,6 @@ in version = "6.0.14"; hash = "sha256-tZlBf3ppntxxYSufEJ86ot6ujvnbfIyZOu9B3kDJ72k="; }; - # EOL 2025-09-15 - varnish76 = common { - version = "7.6.3"; - hash = "sha256-JwP2Ru6JO3iEa8t91LlrKPkSX7iq9+ilaS2k3+SEVGc="; - }; # EOL 2026-03-15 varnish77 = common { version = "7.7.1"; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index ad0b47915810..3bc8b6850a4d 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -55,10 +55,6 @@ in version = "0.15.1"; hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M="; }; - modules25 = common { - version = "0.25.0"; - hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk="; - }; modules26 = common { version = "0.26.0"; hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU="; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 1596a1f67717..3e307a566b17 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -2,7 +2,6 @@ callPackages, callPackage, varnish60, - varnish76, varnish77, }: { @@ -20,10 +19,6 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish76Packages = rec { - varnish = varnish76; - modules = (callPackages ./modules.nix { inherit varnish; }).modules25; - }; varnish77Packages = rec { varnish = varnish77; modules = (callPackages ./modules.nix { inherit varnish; }).modules26; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 304eac20d07d..3e73016a999a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1919,6 +1919,8 @@ mapAliases { varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31 varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 22025-03-29 varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29 + varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15 + varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 ventoy-bin = ventoy; # Added 2023-04-12 ventoy-bin-full = ventoy-full; # Added 2023-04-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8b53c6a3e7e..e9f04474b646 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4800,12 +4800,10 @@ with pkgs; inherit (callPackages ../servers/varnish { }) varnish60 - varnish76 varnish77 ; inherit (callPackages ../servers/varnish/packages.nix { }) varnish60Packages - varnish76Packages varnish77Packages ; varnishPackages = varnish77Packages;