public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

varnishPackages: pin python to varnish python version

Browse Source
This commit is contained in:
Jonathan Ringer 2019-08-15 08:14:40 -07:00
parent c74db7340d
commit 9fe0ee55a7
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,8 @@ let
inherit sha256; inherit sha256;
}; };
passthru.python = python;
nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs; nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs;
buildInputs = [ buildInputs = [
pcre libxslt groff ncurses readline libedit makeWrapper python pcre libxslt groff ncurses readline libedit makeWrapper python

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.3"; version = "0.3";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf"; sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf";
}; };
nativeBuildInputs = [ pkgconfig docutils autoreconfHook ]; nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ];
buildInputs = [ varnish python ]; buildInputs = [ varnish ];
postPatch = '' postPatch = ''
substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal"
''; '';

13
pkgs/servers/varnish/modules.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.14.0"; version = "0.14.0";
@ -11,8 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40"; sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ]; nativeBuildInputs = [
buildInputs = [ varnish python ]; autoreconfHook
docutils
pkgconfig
removeReferencesTo
varnish.python # use same python version as varnish server
];
buildInputs = [ varnish ];
postPatch = '' postPatch = ''
substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal" substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal"

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }: { stdenv, fetchurl, pkgconfig, varnish, docutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.0"; version = "1.2.0";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly"; sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly";
}; };
nativeBuildInputs = [ pkgconfig docutils ]; nativeBuildInputs = [ pkgconfig docutils varnish.python ];
buildInputs = [ varnish python ]; buildInputs = [ varnish ];
configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {