Merge pull request #131537 from helsinki-systems/upd/varnish

varnish: update & fix

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">

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.

pkgs/servers/varnish/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit
+{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils
 , python3, makeWrapper }:
 
 let
@@ -21,6 +21,10 @@ let
 
       buildFlags = [ "localstatedir=/var/spool" ];
 
+      postPatch = ''
+        substituteInPlace bin/varnishtest/vtc_main.c --replace /bin/rm "${coreutils}/bin/rm"
+      '';
+
       postInstall = ''
         wrapProgram "$out/sbin/varnishd" --prefix PATH : "${lib.makeBinPath [ stdenv.cc ]}"
       '';
@@ -44,12 +48,8 @@ in
     version = "6.0.7";
     sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a";
   };
-  varnish62 = common {
-    version = "6.2.3";
-    sha256 = "02b6pqh5j1d4n362n42q42bfjzjrngd6x49b13q7wzsy6igd1jsy";
-  };
-  varnish63 = common {
-    version = "6.3.2";
-    sha256 = "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8";
+  varnish65 = common {
+    version = "6.5.2";
+    sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx";
   };
 }

pkgs/servers/varnish/digest.nix

@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, coreutils, version, sha256 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.2";
   pname = "${varnish.name}-digest";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "varnish";
     repo = "libvmod-digest";
-    rev = "libvmod-digest-${version}";
-    sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx";
+    rev = version;
+    inherit sha256;
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config docutils ];

pkgs/servers/varnish/dynamic.nix

@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils, version, sha256 }:
 
-stdenv.mkDerivation rec {
-  version = "0.4";
+stdenv.mkDerivation {
   pname = "${varnish.name}-dynamic";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "nigoroll";
     repo = "libvmod-dynamic";
     rev = "v${version}";
-    sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
+    inherit sha256;
   };
 
   nativeBuildInputs = [ pkg-config docutils autoreconfHook269 varnish.python ];

pkgs/servers/varnish/packages.nix

@@ -1,15 +1,28 @@
-{ callPackage, varnish60, varnish62, varnish63 }:
-
-{
-  varnish60Packages = {
+{ callPackage, varnish60, varnish65, fetchFromGitHub }: {
+  varnish60Packages = rec {
     varnish = varnish60;
-    digest  = callPackage ./digest.nix   { varnish = varnish60; };
-    dynamic = callPackage ./dynamic.nix  { varnish = varnish60; };
+    digest  = callPackage ./digest.nix {
+      inherit varnish;
+      version = "libvmod-digest-1.0.2";
+      sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx";
     };
-  varnish62Packages = {
-    varnish = varnish62;
+    dynamic = callPackage ./dynamic.nix  {
+      inherit varnish;
+      version = "0.4";
+      sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
+    };
+  };
+  varnish65Packages = rec {
+    varnish = varnish65;
+    digest  = callPackage ./digest.nix {
+      inherit varnish;
+      version = "6.6";
+      sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn";
+    };
+    dynamic = callPackage ./dynamic.nix  {
+      inherit varnish;
+      version = "2.3.1";
+      sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88";
     };
-  varnish63Packages = {
-    varnish = varnish63;
   };
 }

pkgs/top-level/aliases.nix

@@ -894,6 +894,8 @@ mapAliases ({
   v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
   valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38";
   vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
+  varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
+  varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
   venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05
   vdirsyncerStable  = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
   vimbWrapper = vimb; # added 2015-01

pkgs/top-level/all-packages.nix

@@ -10148,13 +10148,11 @@ with pkgs;
   valum = callPackage ../development/web/valum { };
 
   inherit (callPackages ../servers/varnish { })
-    varnish60 varnish62 varnish63;
+    varnish60 varnish65;
   inherit (callPackages ../servers/varnish/packages.nix { })
-    varnish60Packages
-    varnish62Packages
-    varnish63Packages;
+    varnish60Packages varnish65Packages;
 
-  varnishPackages = varnish63Packages;
+  varnishPackages = varnish65Packages;
   varnish = varnishPackages.varnish;
 
   hitch = callPackage ../servers/hitch { };