Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 40e86556d09a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2baf41b0d453
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Aug 15, 2019

  1. varnish5: fix build

    Jonathan Ringer committed Aug 15, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    cdepillabout Dennis Gosnell
    GPG key ID: 462E0C03D11422F4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c74db73 View commit details

  2. varnishPackages: pin python to varnish python version

    Jonathan Ringer committed Aug 15, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    cdepillabout Dennis Gosnell
    GPG key ID: 462E0C03D11422F4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9fe0ee5 View commit details

Commits on Aug 17, 2019

  1. Merge pull request #66564 from jonringer/fix-varnish 

    varnish5: fix build
    @Mic92
    Mic92 authored Aug 17, 2019
    Copy the full SHA
    2baf41b View commit details
Showing with 27 additions and 16 deletions.
  1. +11 −7 pkgs/servers/varnish/default.nix
  2. +3 −3 pkgs/servers/varnish/dynamic.nix
  3. +10 −3 pkgs/servers/varnish/modules.nix
  4. +3 −3 pkgs/servers/varnish/rtstatus.nix
18 changes: 11 additions & 7 deletions pkgs/servers/varnish/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
name = "varnish-${version}";

@@ -11,11 +11,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";

@@ -41,14 +42,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 ];
};
}
6 changes: 3 additions & 3 deletions pkgs/servers/varnish/dynamic.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
'';
13 changes: 10 additions & 3 deletions pkgs/servers/varnish/modules.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions pkgs/servers/varnish/rtstatus.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {