about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvolth <volth@webmaster.ms>2018-10-16 16:09:04 +0000
committerxeji <36407913+xeji@users.noreply.github.com>2018-10-16 18:09:04 +0200
commit4b61dde1dbf924ef23f87c93f0ac951e73299045 (patch)
tree6c4def606634dff9a7a2e7af6f6b607b8decfefa
parentd3b747627884fda87b09041ea90c4eef70ab88e4 (diff)
downloadnixlib-4b61dde1dbf924ef23f87c93f0ac951e73299045.tar
nixlib-4b61dde1dbf924ef23f87c93f0ac951e73299045.tar.gz
nixlib-4b61dde1dbf924ef23f87c93f0ac951e73299045.tar.bz2
nixlib-4b61dde1dbf924ef23f87c93f0ac951e73299045.tar.lz
nixlib-4b61dde1dbf924ef23f87c93f0ac951e73299045.tar.xz
nixlib-4b61dde1dbf924ef23f87c93f0ac951e73299045.tar.zst
nixlib-4b61dde1dbf924ef23f87c93f0ac951e73299045.zip
varnish6: 6.0.1 -> 6.1.0 (#48487)
-rw-r--r--pkgs/servers/varnish/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 8031276e24a6..7517560a521c 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -2,7 +2,7 @@
 , python2, makeWrapper }:
 
 let
-  common = { version, sha256 }:
+  common = { version, sha256, extraBuildInputs ? [] }:
     stdenv.mkDerivation rec {
       name = "varnish-${version}";
 
@@ -15,7 +15,7 @@ let
       buildInputs = [
         pcre libxslt groff ncurses readline python2 libedit
         python2.pkgs.docutils makeWrapper
-      ];
+      ] ++ extraBuildInputs;
 
       buildFlags = "localstatedir=/var/spool";
 
@@ -47,7 +47,8 @@ in
     sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
   };
   varnish6 = common {
-    version = "6.0.1";
-    sha256 = "1f7k751r31sgfvr1ns6s3h48c5x06kkps1p6zd40wvylm56qxwj7";
+    version = "6.1.0";
+    sha256 = "0zg2aqkg7a4zsjpxj0s7mphxv5f9xy279hjwln30h901k18r46qn";
+    extraBuildInputs = [ python2.pkgs.sphinx ];
   };
 }