varnishPackages: general version bumps & refactor

2019-11-03 00:12:04 +01:00
parent 980ecf2cba
commit fbb1165625
8 changed files with 35 additions and 96 deletions
@@ -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;
  };
 }