From 586ca51a784ad223524ca2dfb71738430feb2c1c Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 26 Jul 2021 03:48:23 +0200
Subject: [PATCH] varnishPackages: update default, because we dropped 6.3.x

---
 .../manual/from_md/release-notes/rl-2111.section.xml | 12 ++++++++++++
 nixos/doc/manual/release-notes/rl-2111.section.md    |  3 +++
 pkgs/top-level/all-packages.nix                      |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 68d09a778131..8504593e7683 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -668,6 +668,11 @@
           to use wildcards in the <literal>source</literal> argument.
         </para>
       </listitem>
+    </itemizedlist>
+    <para>
+      &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
+    </para>
+    <itemizedlist>
       <listitem>
         <para>
           The <literal>openrazer</literal> and
@@ -703,6 +708,13 @@
           web UI this port needs to be opened in the firewall.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The <literal>varnish</literal> package was upgraded from 6.3.x
+          to 6.5.x. <literal>varnish60</literal> for the last LTS
+          release is also still available.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-notable-changes">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index d7c38056ef61..024ed9c73998 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -171,6 +171,7 @@ pt-services.clipcat.enable).
 
 - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument.
 
+<<<<<<< HEAD
 - The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group.
 
 - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland.
@@ -179,6 +180,8 @@ pt-services.clipcat.enable).
 configures the address and port the web UI is listening, it defaults to `:9001`.
 To be able to access the web UI this port needs to be opened in the firewall.
 
+- The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available.
+
 ## Other Notable Changes {#sec-release-21.11-notable-changes}
 
 - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78d999341b84..a5ac430f3cf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10152,7 +10152,7 @@ with pkgs;
   inherit (callPackages ../servers/varnish/packages.nix { })
     varnish60Packages varnish65Packages;
 
-  varnishPackages = varnish63Packages;
+  varnishPackages = varnish65Packages;
   varnish = varnishPackages.varnish;
 
   hitch = callPackage ../servers/hitch { };