From 47cbd610ce81dd5288eb9894533ffbd71f508c65 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 14:35:01 +0100 Subject: [PATCH 1/3] varnish71: drop --- nixos/tests/all-tests.nix | 1 - pkgs/servers/varnish/default.nix | 5 ----- pkgs/servers/varnish/packages.nix | 16 +--------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 +++--- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index fbbebc2520a3..4fa102e3fd71 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -671,7 +671,6 @@ in { uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; }; - varnish71 = handleTest ./varnish.nix { package = pkgs.varnish71; }; varnish72 = handleTest ./varnish.nix { package = pkgs.varnish72; }; vault = handleTest ./vault.nix {}; vault-dev = handleTest ./vault-dev.nix {}; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 26ab8ac6d8d3..1e47ec1e035c 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -56,11 +56,6 @@ in version = "6.0.10"; hash = "sha256-a4W/dI7jeaoI43UE+G6tS6fgzEDqsXI8CUv+Wh4HJus="; }; - # EOL 2023-03-15. TODO: remove ahead of 22.11 release? if not, remove for 23.05 - varnish71 = common { - version = "7.1.1"; - hash = "sha256-LK++JZDn1Yp7rIrZm+kuRA/k04raaBbdiDbyL6UToZA="; - }; # EOL 2023-09-15 varnish72 = common { version = "7.2.0"; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index fa5ec507d406..71a7af2426f5 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackages, callPackage, varnish60, varnish71, varnish72, fetchFromGitHub }: { +{ callPackages, callPackage, varnish60, varnish72, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; @@ -13,20 +13,6 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish71Packages = rec { - varnish = varnish71; - modules = (callPackages ./modules.nix { inherit varnish; }).modules20; - digest = callPackage ./digest.nix { - inherit varnish; - version = "6.6"; - sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn"; - }; - dynamic = callPackage ./dynamic.nix { - inherit varnish; - version = "2.4.0"; - sha256 = "1g53zblyxi1jivwppmpdqhi5xnzapsfib453sxyqbc5dfs7fijxr"; - }; - }; varnish72Packages = rec { varnish = varnish72; modules = (callPackages ./modules.nix { inherit varnish; }).modules20; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b778cc11bab0..90bd2ae56cb1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1527,6 +1527,7 @@ mapAliases ({ varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-09-15 varnish70 = throw "varnish70 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-03-17 + varnish71 = throw "varnish71 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-11-08 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 vgo2nix = throw "vgo2nix has been removed, because it was deprecated. Consider using gomod2nix instead"; # added 2022-08-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd137629f369..d8cd07f003a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12830,11 +12830,11 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish71 varnish72; + varnish60 varnish72; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish71Packages varnish72Packages; + varnish60Packages varnish72Packages; - varnishPackages = varnish71Packages; + varnishPackages = varnish72Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; From 807220b9f9efc1d755eba836f4d4ddea92d9b725 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 14:35:49 +0100 Subject: [PATCH 2/3] varnish72: 7.2.0 -> 7.2.1 https://github.com/varnishcache/varnish-cache/blob/7.2/doc/changes.rst#varnish-cache-721-2022-11-08 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 1e47ec1e035c..d287d78ec4f1 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -58,7 +58,7 @@ in }; # EOL 2023-09-15 varnish72 = common { - version = "7.2.0"; - hash = "sha256-HaipftX3t9TV4E/FyW/JqFyzog0HbrorGJUfSzBsloY="; + version = "7.2.1"; + hash = "sha256-TZN9FyCo7BnFM/ly2TA6HJiJt7/KdDeJOuXCfPIEqUA="; }; } From f9c4148be7114a2def69fa39611db95780469d0f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 14:37:04 +0100 Subject: [PATCH 3/3] varnish60: 6.0.10 -> 6.0.11 https://github.com/varnishcache/varnish-cache/blob/6.0/doc/changes.rst#varnish-cache-6011-2022-11-08 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index d287d78ec4f1..68d43313db24 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -53,8 +53,8 @@ in { # EOL TBA varnish60 = common { - version = "6.0.10"; - hash = "sha256-a4W/dI7jeaoI43UE+G6tS6fgzEDqsXI8CUv+Wh4HJus="; + version = "6.0.11"; + hash = "sha256-UVkA2+tH/9MOs5BlyuAzFnmD7Pm9A6lDWic2B+HRKNs="; }; # EOL 2023-09-15 varnish72 = common {