diff options
| author | Robert Scott <code@humanleg.org.uk> | 2022-03-23 22:42:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-23 22:42:00 +0000 |
| commit | 0c31adefdc333664cb501636a3b06b2bc3c8dc63 (patch) | |
| tree | f3fb119051a76242fd542b284f64a24ba311ac54 /pkgs/servers | |
| parent | 754b633e5c17a1cbd20522fa840e4702ac20843c (diff) | |
| parent | 733068d254fbe76a39f1c0c80252e7be4bf85a32 (diff) | |
Merge pull request #164526 from helsinki-systems/upd/varnish
varnish: 7.0.2 -> 7.1.0
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/varnish/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/servers/varnish/packages.nix | 6 |
2 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 7d52b3a0a2665..31884fd802236 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -51,15 +51,8 @@ in version = "6.0.10"; sha256 = "1sr60wg5mzjb14y75cga836f19sbmmpgh13mwc4alyg3irsbz1bb"; }; - varnish70 = (common { - version = "7.0.2"; - sha256 = "0q9z1iilqwbh5flfy9pl18kxv0yjs5z91c4j81z5pgyjd9d4jjjj"; - }).overrideAttrs (oA: { - patches = [ - (fetchpatch { - url = "https://github.com/varnishcache/varnish-cache/commit/20e007a5b17c1f68f70ab42080de384f9e192900.patch"; - sha256 = "0vvihbjknb0skdv2ksn2lz89pwmn4f2rjmb6q65cvgnnjfj46s82"; - }) - ]; - }); + varnish71 = common { + version = "7.1.0"; + sha256 = "1flyqr212jamqpwafdil170vc966r1mbb7n3ngjn8xk6hn3bhjpm"; + }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 257b421112ed5..60141b1382965 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackages, callPackage, varnish60, varnish70, fetchFromGitHub }: { +{ callPackages, callPackage, varnish60, varnish71, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; @@ -13,8 +13,8 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish70Packages = rec { - varnish = varnish70; + varnish71Packages = rec { + varnish = varnish71; modules = (callPackages ./modules.nix { inherit varnish; }).modules19; digest = callPackage ./digest.nix { inherit varnish; |