From 881f8b97eb6c2d68be2ffb26631eac2091a6570a Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 26 Jul 2021 03:45:00 +0200
Subject: [PATCH] varnish: fix varnishtest

---
 pkgs/servers/varnish/default.nix  |  6 +++++-
 pkgs/servers/varnish/digest.nix   |  8 ++++----
 pkgs/servers/varnish/packages.nix | 11 ++++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 68ec4e99eadc..1d4a3276cc09 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/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 ]}"
       '';
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 4511eb3a7245..3f5c6aa43816 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/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, 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 ];
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 9876f131ff0d..c8afc50e4982 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -1,7 +1,11 @@
 { callPackage, varnish60, varnish65, fetchFromGitHub }: {
   varnish60Packages = {
     varnish = varnish60;
-    digest  = callPackage ./digest.nix   { varnish = varnish60; };
+    digest  = callPackage ./digest.nix {
+      varnish = varnish60;
+      version = "libvmod-digest-1.0.2";
+      sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx";
+    };
     dynamic = callPackage ./dynamic.nix  {
       varnish = varnish60;
       version = "0.4";
@@ -10,6 +14,11 @@
   };
   varnish65Packages = {
     varnish = varnish65;
+    digest  = callPackage ./digest.nix {
+      varnish = varnish65;
+      version = "6.6";
+      sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn";
+    };
     dynamic = callPackage ./dynamic.nix  {
       varnish = varnish65;
       version = "2.3.1";