diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-08-15 08:14:40 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-08-15 10:35:41 -0700 |
commit | 9fe0ee55a798411e22c1837476d5f71b7e1e4d0e (patch) | |
tree | 23d5c57cbef50a0c6c11923e6088ff4a25995213 /pkgs/servers/varnish | |
parent | c74db7340d6df67ba3b5d847b384d65cc7dea621 (diff) | |
download | nixpkgs-9fe0ee55a798411e22c1837476d5f71b7e1e4d0e.tar nixpkgs-9fe0ee55a798411e22c1837476d5f71b7e1e4d0e.tar.gz nixpkgs-9fe0ee55a798411e22c1837476d5f71b7e1e4d0e.tar.bz2 nixpkgs-9fe0ee55a798411e22c1837476d5f71b7e1e4d0e.tar.lz nixpkgs-9fe0ee55a798411e22c1837476d5f71b7e1e4d0e.tar.xz nixpkgs-9fe0ee55a798411e22c1837476d5f71b7e1e4d0e.tar.zst nixpkgs-9fe0ee55a798411e22c1837476d5f71b7e1e4d0e.zip |
varnishPackages: pin python to varnish python version
Diffstat (limited to 'pkgs/servers/varnish')
-rw-r--r-- | pkgs/servers/varnish/default.nix | 2 | ||||
-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, 18 insertions, 9 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 16386d5b65d..c9f0f2b84bb 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -11,6 +11,8 @@ let inherit sha256; }; + passthru.python = python; + nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs; buildInputs = [ pcre libxslt groff ncurses readline libedit makeWrapper python diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 711bc1cf78f..b3e86387ee3 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 7775221d163..16c74956db7 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 99c0bb17659..c27633a2d33 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; { |