From 98d6f4dc0afc6b2e9e50b28337125cf7ffe55dfb Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 29 Mar 2025 15:57:47 +0100
Subject: [PATCH] varnish77: init at 7.7.0

---
 nixos/tests/all-tests.nix         | 15 +++++++++++++++
 pkgs/servers/varnish/default.nix  |  5 +++++
 pkgs/servers/varnish/modules.nix  |  4 ++++
 pkgs/servers/varnish/packages.nix |  5 +++++
 pkgs/top-level/all-packages.nix   |  3 ++-
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9fc6594182b0..77c179920439 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1410,6 +1410,7 @@ in
   user-activation-scripts = handleTest ./user-activation-scripts.nix { };
   user-enable-option = runTest ./user-enable-option.nix;
   user-expiry = runTest ./user-expiry.nix;
+<<<<<<< HEAD
   user-home-mode = handleTest ./user-home-mode.nix { };
   ustreamer = handleTest ./ustreamer.nix { };
   uwsgi = handleTest ./uwsgi.nix { };
@@ -1430,6 +1431,20 @@ in
   vault-agent = handleTest ./vault-agent.nix { };
   vault-dev = handleTest ./vault-dev.nix { };
   vault-postgresql = handleTest ./vault-postgresql.nix { };
+=======
+  user-home-mode = handleTest ./user-home-mode.nix {};
+  ustreamer = handleTest ./ustreamer.nix {};
+  uwsgi = handleTest ./uwsgi.nix {};
+  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; };
+  varnish77 = handleTest ./varnish.nix { package = pkgs.varnish77; };
+  vault = handleTest ./vault.nix {};
+  vault-agent = handleTest ./vault-agent.nix {};
+  vault-dev = handleTest ./vault-dev.nix {};
+  vault-postgresql = handleTest ./vault-postgresql.nix {};
+>>>>>>> 0a00164b4295 (varnish77: init at 7.7.0)
   vaultwarden = discoverTests (import ./vaultwarden.nix);
   vdirsyncer = handleTest ./vdirsyncer.nix { };
   vector = handleTest ./vector { };
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 976147d8ab33..3f020a0163ba 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -104,4 +104,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 ff9041c61f98..2c52cf6f9efd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5607,13 +5607,14 @@ with pkgs;
     varnish60
     varnish75
     varnish76
+    varnish77
     ;
   inherit (callPackages ../servers/varnish/packages.nix { })
     varnish60Packages
     varnish75Packages
     varnish76Packages
+    varnish77Packages
     ;
-
   varnishPackages = varnish75Packages;
   varnish = varnishPackages.varnish;