nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-16 17:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

varnish: fix varnishtest

Browse Source
This commit is contained in:
ajs124 2021-07-26 03:45:00 +02:00
parent 9c765d4534
commit 881f8b97eb
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/varnish/default.nix
View File

@ -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 ]}"
'';

8
pkgs/servers/varnish/digest.nix
View File

@ -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 ];

11
pkgs/servers/varnish/packages.nix
View File

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