colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

varnish72: drop, varnish73: drop

Browse Source 
All of them are EOL according to https://endoflife.date/varnish
This commit is contained in:
Raito Bezarius 2023-10-09 03:06:32 +02:00
parent 35c640b19a
commit f9f7fd208a
5 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -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 {};

12
pkgs/servers/varnish/default.nix
View File

@ -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=";
};
}

10
pkgs/servers/varnish/packages.nix
View File

@ -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;
};
}

4
pkgs/top-level/aliases.nix
View File

@ -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 ###

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };