From 842d9ba4e5dcdb76a6965f95f8400f4ee8f900c8 Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Tue, 14 Jan 2025 16:56:17 +0100 Subject: [PATCH] varnish76: init at 7.6.1 (cherry picked from commit 0129b83a02516278fdcf123343034f6744767ad6) --- nixos/tests/all-tests.nix | 1 + pkgs/servers/varnish/default.nix | 5 +++++ pkgs/servers/varnish/modules.nix | 4 ++++ pkgs/servers/varnish/packages.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 17 insertions(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a20b85838e77..682cdce5b769 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1185,6 +1185,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 17bc57781e69..f632049baf7e 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -110,4 +110,9 @@ in }) ]; }; + # 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 f16e8d53fd55..56edb1e896e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6258,10 +6258,12 @@ with pkgs; inherit (callPackages ../servers/varnish { }) varnish60 varnish75 + varnish76 ; inherit (callPackages ../servers/varnish/packages.nix { }) varnish60Packages varnish75Packages + varnish76Packages ; varnishPackages = varnish75Packages;