diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 837bdc7e9fdd..9c40a78094fa 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1139,6 +1139,7 @@ in { v2ray = handleTest ./v2ray.nix {}; varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; }; varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; }; + varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; }; vault = handleTest ./vault.nix {}; vault-agent = handleTest ./vault-agent.nix {}; vault-dev = handleTest ./vault-dev.nix {}; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index d1d67d74b153..fd969f35f3be 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -99,4 +99,9 @@ in version = "7.5.0"; hash = "sha256-/KYbmDE54arGHEVG0SoaOrmAfbsdgxRXHjFIyT/3K10="; }; + # EOL 2025-09-15 + varnish76 = common { + version = "7.6.1"; + hash = "sha256-Wpu1oUn/J4Z7VKZs4W0qS5Pt/6VHPLh8nHH3aZz4Rbo="; + }; } diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 225d5c5e9f42..d51a2dae3f7c 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -59,4 +59,8 @@ in version = "0.24.0"; hash = "sha256-2MfcrhhkBz9GyQxEWzjipdn1CBEqnCvC3t1G2YSauak="; }; + modules25 = common { + version = "0.25.0"; + hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk="; + }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index f5d72f8226da..114e3db4b131 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -3,6 +3,7 @@ callPackage, varnish60, varnish75, + varnish76, }: { varnish60Packages = rec { @@ -23,4 +24,8 @@ varnish = varnish75; modules = (callPackages ./modules.nix { inherit varnish; }).modules24; }; + varnish76Packages = rec { + varnish = varnish76; + modules = (callPackages ./modules.nix { inherit varnish; }).modules25; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68b022b96e8f..f9a464997b2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5493,9 +5493,9 @@ with pkgs; unzipNLS = lowPrio (unzip.override { enableNLS = true; }); inherit (callPackages ../servers/varnish { }) - varnish60 varnish75; + varnish60 varnish75 varnish76; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish75Packages; + varnish60Packages varnish75Packages varnish76Packages; varnishPackages = varnish75Packages; varnish = varnishPackages.varnish;