varnishPackages: general version bumps & refactor

7 files changed, 30 insertions, 91 deletions

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 4756fbdafb6a..8af11183c699 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
-, python2, python3, makeWrapper }:
+, python3, makeWrapper }:
 
 let
-  common = { version, sha256, python, extraNativeBuildInputs ? [] }:
+  common = { version, sha256, extraNativeBuildInputs ? [] }:
     stdenv.mkDerivation rec {
       pname = "varnish";
       inherit version;
@@ -12,11 +12,11 @@ let
         inherit sha256;
       };
 
-      passthru.python = python;
+      passthru.python = python3;
 
-      nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs;
+      nativeBuildInputs = with python3.pkgs; [ pkgconfig docutils sphinx ];
       buildInputs = [
-        pcre libxslt groff ncurses readline libedit makeWrapper python
+        pcre libxslt groff ncurses readline libedit makeWrapper python3
       ];
 
       buildFlags = "localstatedir=/var/spool";
@@ -40,20 +40,16 @@ let
     };
 in
 {
-  varnish4 = common {
-    version = "4.1.10";
-    sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n";
-    python = python2;
+  varnish60 = common {
+    version = "6.0.5";
+    sha256 = "11aw202s7zdp5qp66hii5nhgm2jk0d86pila7gqrnjgc7x8fs8a0";
   };
-  varnish5 = common {
-    version = "5.2.1";
-    sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
-    python = python2;
+  varnish62 = common {
+    version = "6.2.2";
+    sha256 = "10s3qdvb95pkwp3wxndrigb892h0109yqr8dw4smrhfi0knhnfk5";
   };
-  varnish6 = common {
-    version = "6.3.0";
-    sha256 = "0zwlffdd1m0ih33nq40xf2wwdyvr4czmns2fs90qpfnwy72xxk4m";
-    python = python3;
-    extraNativeBuildInputs = [ python3.pkgs.sphinx ];
+  varnish63 = common {
+    version = "6.3.1";
+    sha256 = "0xa14pd68zpi5hxcax3arl14rcmh5d1cdwa8gv4l5f23mmynr8ni";
   };
 }
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 2ccb0419c042..f11c577288f7 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/pkgs/servers/varnish/digest.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
+
   doCheck = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
index b3e86387ee32..7db4680ac62a 100644
--- a/pkgs/servers/varnish/dynamic.nix
+++ b/pkgs/servers/varnish/dynamic.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }:
 
 stdenv.mkDerivation rec {
-  version = "0.3";
+  version = "0.4";
   name = "${varnish.name}-dynamic-${version}";
 
   src = fetchFromGitHub {
     owner = "nigoroll";
     repo = "libvmod-dynamic";
-    rev = "475be183fddbd727c3d2523f0518effa9aa881f8"; # 5.2 branch for Varnish-5.2 https://github.com/nigoroll/libvmod-dynamic/commits/5.2
-    sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf";
+    rev = "v${version}";
+    sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
   };
 
   nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ];
diff --git a/pkgs/servers/varnish/geoip.nix b/pkgs/servers/varnish/geoip.nix
deleted file mode 100644
index d1790252065c..000000000000
--- a/pkgs/servers/varnish/geoip.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, geoip, docutils }:
-
-stdenv.mkDerivation rec {
-  version = "1.0.2";
-  name = "${varnish.name}-geoip-${version}";
-
-  src = fetchFromGitHub {
-    owner = "varnish";
-    repo = "libvmod-geoip";
-    rev = "libvmod-geoip-${version}";
-    sha256 = "1gmadayqh3dais14c4skvd47w8h4kyifg7kcw034i0777z5hfpyn";
-  };
-
-  patches = [
-    # IPv6 support
-    (fetchpatch {
-      url = https://github.com/volth/libvmod-geoip-1/commit/0966fe8.patch;
-      sha256 = "053im8h2y8qzs37g95ksr00sf625p23r5ps1j0a2h4lfg70vf4ry";
-    })
-  ];
-
-  nativeBuildInputs = [ autoreconfHook pkgconfig docutils ];
-  buildInputs = [ varnish geoip ];
-  configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
-
-  meta = with stdenv.lib; {
-    description = "GeoIP Varnish module by Varnish Software";
-    homepage = https://github.com/varnish/libvmod-geoip;
-    inherit (varnish.meta) license platforms maintainers;
-  };
-}
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 16c74956db7e..32c462e4a775 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.0";
+  version = "0.15.0";
   name = "${varnish.name}-modules-${version}";
 
   src = fetchFromGitHub {
     owner = "varnish";
     repo = "varnish-modules";
     rev = version;
-    sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40";
+    sha256 = "00p9syl765lfg1d2ka7da6h46dfl388f8h36x9cmrjix95rg0yr8";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index f468ac58e6cd..a5c5fe868d01 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -1,22 +1,15 @@
-{ callPackage, varnish4, varnish5, varnish6 }:
+{ callPackage, varnish60, varnish62, varnish63 }:
 
 {
-  varnish4Packages = {
-    varnish = varnish4;
-    digest   = callPackage ./digest.nix   { varnish = varnish4; };
-    rtstatus = callPackage ./rtstatus.nix { varnish = varnish4; }; # varnish4 only
-    modules  = callPackage ./modules.nix  { varnish = varnish4; }; # varnish4 and varnish5 only
-    geoip    = callPackage ./geoip.nix    { varnish = varnish4; }; # varnish4 and varnish5 only
+  varnish60Packages = {
+    varnish = varnish60;
+    digest  = callPackage ./digest.nix   { varnish = varnish60; };
+    dynamic = callPackage ./dynamic.nix  { varnish = varnish60; };
   };
-  varnish5Packages = {
-    varnish = varnish5;
-    digest   = callPackage ./digest.nix   { varnish = varnish5; };
-    dynamic  = callPackage ./dynamic.nix  { varnish = varnish5; }; # varnish5 only (upstream has a separate branch for varnish4)
-    modules  = callPackage ./modules.nix  { varnish = varnish5; }; # varnish4 and varnish5 only
-    geoip    = callPackage ./geoip.nix    { varnish = varnish5; }; # varnish4 and varnish5 only
+  varnish62Packages = {
+    varnish = varnish62;
   };
-  varnish6Packages = {
-    varnish = varnish6;
-    digest   = callPackage ./digest.nix   { varnish = varnish6; };
+  varnish63Packages = {
+    varnish = varnish63;
   };
 }
diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix
deleted file mode 100644
index c27633a2d333..000000000000
--- a/pkgs/servers/varnish/rtstatus.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, varnish, docutils }:
-
-stdenv.mkDerivation rec {
-  version = "1.2.0";
-  name = "${varnish.name}-rtstatus-${version}";
-
-  src = fetchurl {
-    url = "https://download.varnish-software.com/libvmod-rtstatus/libvmod-rtstatus-${version}.tar.gz";
-    sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly";
-  };
-
-  nativeBuildInputs = [ pkgconfig docutils varnish.python ];
-  buildInputs = [ varnish ];
-  configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
-
-  meta = with stdenv.lib; {
-    description = "Varnish realtime status page";
-    homepage = https://github.com/varnish/libvmod-rtstatus;
-    inherit (varnish.meta) license platforms maintainers;
-  };
-}