diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1283bb8bf3cd..83c759e3de0c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1737,10 +1737,6 @@ in imports = [ ./varnish.nix ]; _module.args.package = pkgs.varnish60; }; - varnish77 = runTest { - imports = [ ./varnish.nix ]; - _module.args.package = pkgs.varnish77; - }; varnish80 = runTest { imports = [ ./varnish.nix ]; _module.args.package = pkgs.varnish80; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 6d50f051655a..94567b556c1f 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -147,9 +147,6 @@ let lib.maintainers.osnyx ]; platforms = lib.platforms.unix; - knownVulnerabilities = lib.optionals (lib.versions.major version == "7") [ - "VSV00018: https://vinyl-cache.org/security/VSV00018.html" - ]; broken = stdenv.isDarwin && version == "8.0.1"; # https://github.com/NixOS/nixpkgs/issues/495368 }; }; @@ -160,11 +157,6 @@ in version = "6.0.17"; hash = "sha256-CVmHd1hCDFE/WIZqjc1TfX1O2RqFetdNSO4ihmXoL5k="; }; - # EOL 2026-03-15 - varnish77 = common { - version = "7.7.3"; - hash = "sha256-6W7q/Ez+KlWO0vtU8eIr46PZlfRvjADaVF1YOq74AjY="; - }; # EOL 2026-09-15 varnish80 = common { version = "8.0.1"; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 3dc5943fb152..557032cfc976 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="; }; - modules26 = common { - version = "0.26.0"; - hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU="; - }; modules27 = common { version = "0.27.0"; hash = "sha256-1hE+AKsC6Td+Al7LFN6bgPicU8dtWd3A8PP7VKZLvYM="; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 7167ca143741..f5d6ffb1afb8 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -2,7 +2,6 @@ callPackages, callPackage, varnish60, - varnish77, varnish80, lib, }: @@ -21,10 +20,6 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish77Packages = lib.recurseIntoAttrs rec { - varnish = varnish77; - modules = (callPackages ./modules.nix { inherit varnish; }).modules26; - }; varnish80Packages = lib.recurseIntoAttrs rec { varnish = varnish80; modules = (callPackages ./modules.nix { inherit varnish; }).modules27; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aa257d849b1e..70d75fb3384a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2104,6 +2104,8 @@ mapAliases { valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01 vamp.vampSDK = throw "'vamp.vampSDK' has been renamed to/replaced by 'vamp-plugin-sdk'"; # Converted to throw 2025-10-27 vapoursynth-nnedi3 = throw "'vapoursynth-nnedi3' has been removed per upstream. Use vapoursynth-znedi3 instead."; # Added 2026-04-20 + varnish77 = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01 + varnish77Packages = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01 vaultwarden-vault = throw "'vaultwarden-vault' has been renamed to/replaced by 'vaultwarden.webvault'"; # Converted to throw 2025-10-27 vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11 vboot_reference = vboot-utils; # Added 2025-11-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 001ee576682d..947fcf6bc63e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3464,12 +3464,10 @@ with pkgs; inherit (callPackages ../servers/varnish { }) varnish60 - varnish77 varnish80 ; inherit (callPackages ../servers/varnish/packages.nix { }) varnish60Packages - varnish77Packages varnish80Packages ; varnishPackages = varnish80Packages;