about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-08-13 14:23:26 +0200
committerGitHub <noreply@github.com>2019-08-13 14:23:26 +0200
commitbe28074e54b533b0ad551e0b20c2133f00d5740d (patch)
treef5cf2597d2d5b8dde57fb3d1ed31b567720a46f5
parentcfe629e42d3a5e3da3839ec09057ac6e31d20ef4 (diff)
parentf1f59e19d299c2f4c5612c37f0273ca87b5844e0 (diff)
downloadnixlib-be28074e54b533b0ad551e0b20c2133f00d5740d.tar
nixlib-be28074e54b533b0ad551e0b20c2133f00d5740d.tar.gz
nixlib-be28074e54b533b0ad551e0b20c2133f00d5740d.tar.bz2
nixlib-be28074e54b533b0ad551e0b20c2133f00d5740d.tar.lz
nixlib-be28074e54b533b0ad551e0b20c2133f00d5740d.tar.xz
nixlib-be28074e54b533b0ad551e0b20c2133f00d5740d.tar.zst
nixlib-be28074e54b533b0ad551e0b20c2133f00d5740d.zip
Merge pull request #66559 from jonringer/bump-varnish
varnish6: 6.1.1 -> 6.2.0
-rw-r--r--pkgs/servers/varnish/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 40d08841eac5..4ee23e68265f 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
-, python2, makeWrapper }:
+, python3, makeWrapper }:
 
 let
   common = { version, sha256, extraBuildInputs ? [] }:
@@ -13,8 +13,8 @@ let
 
       nativeBuildInputs = [ pkgconfig ];
       buildInputs = [
-        pcre libxslt groff ncurses readline python2 libedit
-        python2.pkgs.docutils makeWrapper
+        pcre libxslt groff ncurses readline python3 libedit
+        python3.pkgs.docutils makeWrapper
       ] ++ extraBuildInputs;
 
       buildFlags = "localstatedir=/var/spool";
@@ -47,8 +47,8 @@ in
     sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
   };
   varnish6 = common {
-    version = "6.1.1";
-    sha256 = "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0";
-    extraBuildInputs = [ python2.pkgs.sphinx ];
+    version = "6.2.0";
+    sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3";
+    extraBuildInputs = [ python3.pkgs.sphinx ];
   };
 }