diff options
| author | ajs124 <git@ajs124.de> | 2021-07-26 03:45:00 +0200 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2021-08-12 19:08:59 +0200 |
| commit | 881f8b97eb6c2d68be2ffb26631eac2091a6570a (patch) | |
| tree | ef622bd6530e13a88429e871bbad6b84aa481870 /pkgs/servers/varnish | |
| parent | 9c765d4534e8b4a58c61f8fd0175c295a2bb86e4 (diff) | |
| download | nixpkgs-881f8b97eb6c2d68be2ffb26631eac2091a6570a.tar nixpkgs-881f8b97eb6c2d68be2ffb26631eac2091a6570a.tar.gz nixpkgs-881f8b97eb6c2d68be2ffb26631eac2091a6570a.tar.bz2 nixpkgs-881f8b97eb6c2d68be2ffb26631eac2091a6570a.tar.lz nixpkgs-881f8b97eb6c2d68be2ffb26631eac2091a6570a.tar.xz nixpkgs-881f8b97eb6c2d68be2ffb26631eac2091a6570a.tar.zst nixpkgs-881f8b97eb6c2d68be2ffb26631eac2091a6570a.zip | |
varnish: fix varnishtest
Diffstat (limited to 'pkgs/servers/varnish')
| -rw-r--r-- | pkgs/servers/varnish/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/varnish/digest.nix | 8 | ||||
| -rw-r--r-- | 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 68ec4e99ead..1d4a3276cc0 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 4511eb3a724..3f5c6aa4381 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 9876f131ff0..c8afc50e498 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"; |