diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-18 12:53:44 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-18 12:53:44 +0200 |
commit | f65aa21bb2b0a45ac671e8c9d656b1dfc88cda33 (patch) | |
tree | 98bb48130a5c464418af19f314236e112ad20c55 /pkgs/servers/varnish | |
parent | b8a79ac677bbc0f7b662bcc0c4fcb9df34c9f5f3 (diff) | |
parent | ffbb4d26f9f93681576815be82142d14f2aa8234 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/varnish')
-rw-r--r-- | pkgs/servers/varnish/default.nix | 18 | ||||
-rw-r--r-- | pkgs/servers/varnish/dynamic.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/varnish/modules.nix | 13 | ||||
-rw-r--r-- | pkgs/servers/varnish/rtstatus.nix | 6 |
4 files changed, 27 insertions, 16 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 2375e81ff9eb..8a63ed3ea7f1 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python3, makeWrapper }: +, python2, python3, makeWrapper }: let - common = { version, sha256, extraBuildInputs ? [] }: + common = { version, sha256, python, extraNativeBuildInputs ? [] }: stdenv.mkDerivation rec { pname = "varnish"; inherit version; @@ -12,11 +12,12 @@ let inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + passthru.python = python; + + nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs; buildInputs = [ - pcre libxslt groff ncurses readline python3 libedit - python3.pkgs.docutils makeWrapper - ] ++ extraBuildInputs; + pcre libxslt groff ncurses readline libedit makeWrapper python + ]; buildFlags = "localstatedir=/var/spool"; @@ -42,14 +43,17 @@ in varnish4 = common { version = "4.1.10"; sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n"; + python = python2; }; varnish5 = common { version = "5.2.1"; sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; + python = python2; }; varnish6 = common { version = "6.2.0"; sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"; - extraBuildInputs = [ python3.pkgs.sphinx ]; + python = python3; + extraNativeBuildInputs = [ python3.pkgs.sphinx ]; }; } diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 711bc1cf78f5..b3e86387ee32 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "0.3"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf"; }; - nativeBuildInputs = [ pkgconfig docutils autoreconfHook ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ]; + buildInputs = [ varnish ]; postPatch = '' substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" ''; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 7775221d1638..16c74956db7e 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.14.0"; @@ -11,8 +11,15 @@ stdenv.mkDerivation rec { sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ + autoreconfHook + docutils + pkgconfig + removeReferencesTo + varnish.python # use same python version as varnish server + ]; + + buildInputs = [ varnish ]; postPatch = '' substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal" diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix index 99c0bb176597..c27633a2d333 100644 --- a/pkgs/servers/varnish/rtstatus.nix +++ b/pkgs/servers/varnish/rtstatus.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }: +{ stdenv, fetchurl, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly"; }; - nativeBuildInputs = [ pkgconfig docutils ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ pkgconfig docutils varnish.python ]; + buildInputs = [ varnish ]; configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; meta = with stdenv.lib; { |