diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 22:52:08 +0200 |
commit | 30f31c9afcc34336d1d47c62ad4ed39d2dee402a (patch) | |
tree | e3549d198c833f11e5f6062e10a3fefb9d25a670 /pkgs/servers/varnish/default.nix | |
parent | c1cc2348e4d49ab742e964593a7f74cc53c7f9b7 (diff) | |
parent | 2cb3dc68120701406ac48d7a4da5ff097b092f85 (diff) | |
download | nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.gz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.bz2 nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.lz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.xz nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.tar.zst nixpkgs-30f31c9afcc34336d1d47c62ad4ed39d2dee402a.zip |
Merge 'master' into staging
(relatively simple conflicts)
Diffstat (limited to 'pkgs/servers/varnish/default.nix')
-rw-r--r-- | pkgs/servers/varnish/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 5b191bef872..358afb3dfb3 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, python }: +{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, python +, pythonPackages }: stdenv.mkDerivation rec { - version = "3.0.6"; + version = "4.0.3"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "1dw0nrplx5pa09z8vbjpncniv3qib5bh3qp3yqbk2d774n7ys3c4"; + sha256 = "01l2iypajkdanxpbvzfxm6vs4jay4dgw7lmchqidnivz15sa3fcl"; }; - buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python ]; + buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python + pythonPackages.docutils]; meta = { description = "Web application accelerator also known as a caching HTTP reverse proxy"; |