From f9f7fd208a95b6610b6778c4e1b77aaa1cc8c8e4 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 9 Oct 2023 03:06:32 +0200 Subject: [PATCH 1/4] varnish72: drop, varnish73: drop All of them are EOL according to https://endoflife.date/varnish --- nixos/tests/all-tests.nix | 2 -- pkgs/servers/varnish/default.nix | 12 +----------- pkgs/servers/varnish/packages.nix | 10 +--------- pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 6 +++--- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index da788cc159c8..9cf6cfccc0e9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -855,8 +855,6 @@ in { uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; }; - varnish72 = handleTest ./varnish.nix { package = pkgs.varnish72; }; - varnish73 = handleTest ./varnish.nix { package = pkgs.varnish73; }; vault = handleTest ./vault.nix {}; vault-agent = handleTest ./vault-agent.nix {}; vault-dev = handleTest ./vault-dev.nix {}; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 82a1acf44ca3..09b26ed319e4 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -51,19 +51,9 @@ let }; in { - # EOL TBA + # EOL (LTS) TBA varnish60 = common { version = "6.0.11"; hash = "sha256-UVkA2+tH/9MOs5BlyuAzFnmD7Pm9A6lDWic2B+HRKNs="; }; - # EOL 2023-09-15 - varnish72 = common { - version = "7.2.1"; - hash = "sha256-TZN9FyCo7BnFM/ly2TA6HJiJt7/KdDeJOuXCfPIEqUA="; - }; - # EOL 2024-03-15 - varnish73 = common { - version = "7.3.0"; - hash = "sha256-4tu7DsJwqQZHw4aGbm4iaZOu1G5I3nUacruBlzfxSuc="; - }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 9daa0f8ac59d..99f0450656bb 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackages, callPackage, varnish60, varnish72, varnish73, fetchFromGitHub }: { +{ callPackages, callPackage, varnish60, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; @@ -13,12 +13,4 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish72Packages = rec { - varnish = varnish72; - modules = (callPackages ./modules.nix { inherit varnish; }).modules20; - }; - varnish73Packages = rec { - varnish = varnish73; - modules = (callPackages ./modules.nix { inherit varnish; }).modules22; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8831f69b60c0..3468daf8e0fd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -853,6 +853,10 @@ mapAliases ({ vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 vte_290 = throw "'vte_290' has been renamed to/replaced by 'vte'"; # Added 2023-01-05 + varnish72 = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 + varnish73 = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 + varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 + varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 ### W ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 591d5e425bae..0063208cab77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14849,11 +14849,11 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish72 varnish73; + varnish60; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish72Packages varnish73Packages; + varnish60Packages; - varnishPackages = varnish72Packages; + varnishPackages = varnish60Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; From dbe4e6d2c04828740d69c0f7993817511da9dd2e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 9 Oct 2023 14:14:21 +0200 Subject: [PATCH 2/4] varnish74: init at 7.4.1 --- nixos/tests/all-tests.nix | 1 + pkgs/servers/varnish/default.nix | 5 +++++ pkgs/servers/varnish/packages.nix | 6 +++++- pkgs/top-level/all-packages.nix | 6 +++--- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9cf6cfccc0e9..5145540dd11c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -855,6 +855,7 @@ in { uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; }; + varnish74 = handleTest ./varnish.nix { package = pkgs.varnish74; }; vault = handleTest ./vault.nix {}; vault-agent = handleTest ./vault-agent.nix {}; vault-dev = handleTest ./vault-dev.nix {}; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 09b26ed319e4..a3521fe073fa 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -56,4 +56,9 @@ in version = "6.0.11"; hash = "sha256-UVkA2+tH/9MOs5BlyuAzFnmD7Pm9A6lDWic2B+HRKNs="; }; + # EOL 2024-09-15 + varnish74 = common { + version = "7.4.1"; + hash = "sha256-h02Deq9JuPJxjLYLjIx5AOnqEMJk8hjIjNZy1Zb0uJ8="; + }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 99f0450656bb..d382ede8a341 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackages, callPackage, varnish60, fetchFromGitHub }: { +{ callPackages, callPackage, varnish60, varnish74, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; @@ -13,4 +13,8 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; + varnish74Packages = rec { + varnish = varnish74; + modules = (callPackages ./modules.nix { inherit varnish; }).modules22; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0063208cab77..c66a3e0174e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14849,11 +14849,11 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60; + varnish60 varnish74; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages; + varnish60Packages varnish74Packages; - varnishPackages = varnish60Packages; + varnishPackages = varnish74Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; From fd35d495c80c5daaf59c0529ace2523e520d4850 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 9 Oct 2023 14:16:32 +0200 Subject: [PATCH 3/4] varnish/modules: update/clean-up --- pkgs/servers/varnish/modules.nix | 10 +++------- pkgs/servers/varnish/packages.nix | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 4a921600294c..ee05a8181a5d 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -41,12 +41,8 @@ in version = "0.15.1"; sha256 = "1lwgjhgr5yw0d17kbqwlaj5pkn70wvaqqjpa1i0n459nx5cf5pqj"; }; - modules20 = common { - version = "0.20.0"; - sha256 = "sha256-3eH3qCa24rWqYXsTTDmm/9LjBMxcxUuozuRzZ3e8cUo="; - }; - modules22 = common { - version = "0.22.0"; - sha256 = "sha256-eoa6i6AuOS4pxQKA/lbJnwFc39cRiLqnBSpPM4Oitrc="; + modules23 = common { + version = "0.23.0"; + sha256 = "sha256-Dd1pLMmRC59iRRpReDeQJ8Sv00ojb8InvaMrb+iRv4I="; }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index d382ede8a341..1d0b3e45da7a 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -15,6 +15,6 @@ }; varnish74Packages = rec { varnish = varnish74; - modules = (callPackages ./modules.nix { inherit varnish; }).modules22; + modules = (callPackages ./modules.nix { inherit varnish; }).modules23; }; } From 6e45bee3b374399be8016130194d9ff6ffda9aef Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 9 Oct 2023 14:18:50 +0200 Subject: [PATCH 4/4] nixos/rl-2311: add varnish upgrade notes --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 3a1ccfd6bc91..0c8880b0979e 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -183,6 +183,8 @@ - `odoo` now defaults to 16, updated from 15. +- `varnish` was upgraded from 7.2.x to 7.4.x, see https://varnish-cache.org/docs/7.3/whats-new/upgrading-7.3.html and https://varnish-cache.org/docs/7.4/whats-new/upgrading-7.4.html for upgrade notes. The current LTS version is still offered as `varnish60`. + - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. - `services.keyd` changed API. Now you can create multiple configuration files.