From 04d71bccc1e9c98abde3b9496f7c6ac8edff856a Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 15 Sep 2022 15:02:00 +0200
Subject: varnish72: init at 7.2.0

see https://varnish-cache.org/releases/rel7.2.0.html
---
 pkgs/servers/varnish/default.nix  | 7 +++++++
 pkgs/servers/varnish/modules.nix  | 6 +++---
 pkgs/servers/varnish/packages.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix   | 4 ++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 6f34c2ebab8..3a3f0d95a51 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -48,12 +48,19 @@ let
     };
 in
 {
+  # EOL TBA
   varnish60 = common {
     version = "6.0.10";
     hash = "sha256-a4W/dI7jeaoI43UE+G6tS6fgzEDqsXI8CUv+Wh4HJus=";
   };
+  # EOL 2023-03-15. TODO: remove ahead of 22.11 release? if not, remove for 23.05
   varnish71 = common {
     version = "7.1.1";
     hash = "sha256-LK++JZDn1Yp7rIrZm+kuRA/k04raaBbdiDbyL6UToZA=";
   };
+  # EOL 2023-09-15
+  varnish72 = common {
+    version = "7.2.0";
+    hash = "sha256-HaipftX3t9TV4E/FyW/JqFyzog0HbrorGJUfSzBsloY=";
+  };
 }
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 4922907f920..018127c9691 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -41,8 +41,8 @@ in
     version = "0.15.1";
     sha256 = "1lwgjhgr5yw0d17kbqwlaj5pkn70wvaqqjpa1i0n459nx5cf5pqj";
   };
-  modules19 = common {
-    version = "0.19.0";
-    sha256 = "0qq5g6bbd1a1ml1wk8jj9z39a899jzqbf7aizr3pvyz0f4kz8mis";
+  modules20 = common {
+    version = "0.20.0";
+    sha256 = "sha256-3eH3qCa24rWqYXsTTDmm/9LjBMxcxUuozuRzZ3e8cUo=";
   };
 }
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 60141b13829..fa5ec507d40 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -1,4 +1,4 @@
-{ callPackages, callPackage, varnish60, varnish71, fetchFromGitHub }: {
+{ callPackages, callPackage, varnish60, varnish71, varnish72, fetchFromGitHub }: {
   varnish60Packages = rec {
     varnish = varnish60;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@@ -15,7 +15,7 @@
   };
   varnish71Packages = rec {
     varnish = varnish71;
-    modules = (callPackages ./modules.nix { inherit varnish; }).modules19;
+    modules = (callPackages ./modules.nix { inherit varnish; }).modules20;
     digest  = callPackage ./digest.nix {
       inherit varnish;
       version = "6.6";
@@ -27,4 +27,8 @@
       sha256 = "1g53zblyxi1jivwppmpdqhi5xnzapsfib453sxyqbc5dfs7fijxr";
     };
   };
+  varnish72Packages = rec {
+    varnish = varnish72;
+    modules = (callPackages ./modules.nix { inherit varnish; }).modules20;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 119702effa3..74ac19a2f4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12492,9 +12492,9 @@ with pkgs;
   valum = callPackage ../development/web/valum { };
 
   inherit (callPackages ../servers/varnish { })
-    varnish60 varnish71;
+    varnish60 varnish71 varnish72;
   inherit (callPackages ../servers/varnish/packages.nix { })
-    varnish60Packages varnish71Packages;
+    varnish60Packages varnish71Packages varnish72Packages;
 
   varnishPackages = varnish71Packages;
   varnish = varnishPackages.varnish;
-- 
cgit 1.4.1