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

Merge pull request #66559 from jonringer/bump-varnish

Browse Source 
varnish6: 6.1.1 -> 6.2.0
This commit is contained in:
Marek Mahut 2019-08-13 14:23:26 +02:00 committed by GitHub
commit be28074e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
, python2, makeWrapper }: , python3, makeWrapper }:
let let
common = { version, sha256, extraBuildInputs ? [] }: common = { version, sha256, extraBuildInputs ? [] }:
@ -13,8 +13,8 @@ let
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
pcre libxslt groff ncurses readline python2 libedit pcre libxslt groff ncurses readline python3 libedit
python2.pkgs.docutils makeWrapper python3.pkgs.docutils makeWrapper
] ++ extraBuildInputs; ] ++ extraBuildInputs;
buildFlags = "localstatedir=/var/spool"; buildFlags = "localstatedir=/var/spool";
@ -47,8 +47,8 @@ in
sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
}; };
varnish6 = common { varnish6 = common {
version = "6.1.1"; version = "6.2.0";
sha256 = "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0"; sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3";
extraBuildInputs = [ python2.pkgs.sphinx ]; extraBuildInputs = [ python3.pkgs.sphinx ];
}; };
} }