From e93de65b207242dc84ba68ff7850682f7fa3580c Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 15 May 2025 09:50:23 +0200 Subject: [PATCH] varnish77: init at 7.7.0 (cherry picked from commit 98d6f4dc0afc6b2e9e50b28337125cf7ffe55dfb) --- 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 682cdce5b769..ad3f1de0eb65 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1186,6 +1186,7 @@ in varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; }; varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; }; varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; }; + varnish77 = handleTest ./varnish.nix { package = pkgs.varnish77; }; 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 f342d9d752b6..d9d373219af8 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -115,4 +115,9 @@ in version = "7.6.2"; hash = "sha256-OFxhDsxj3P61PXb0fMRl6J6+J9osCSJvmGHE+o6dLJo="; }; + # EOL 2026-03-15 + varnish77 = common { + version = "7.7.0"; + hash = "sha256-aZSPIVEfgc548JqXFdmodQ6BEWGb1gVaPIYTFaIQtOQ="; + }; } diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index d51a2dae3f7c..46223e939f40 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -63,4 +63,8 @@ in 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 114e3db4b131..85d9fb6bd3a3 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -4,6 +4,7 @@ varnish60, varnish75, varnish76, + varnish77, }: { varnish60Packages = rec { @@ -28,4 +29,8 @@ 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/all-packages.nix b/pkgs/top-level/all-packages.nix index 56edb1e896e5..2450dc2ba7f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6259,11 +6259,13 @@ with pkgs; varnish60 varnish75 varnish76 + varnish77 ; inherit (callPackages ../servers/varnish/packages.nix { }) varnish60Packages varnish75Packages varnish76Packages + varnish77Packages ; varnishPackages = varnish75Packages;