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

varnish74: drop

Browse Source 
Varnish 7.4 is EOL and not supported upstream anymore again.
This commit is contained in:
Thomas Gerbet 2024-10-31 00:09:41 +01:00
parent 7b9ed305fd
commit 132cb2a957
6 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1111,7 +1111,6 @@ in {
uwsgi = handleTest ./uwsgi.nix {};
v2ray = handleTest ./v2ray.nix {};
varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
varnish74 = handleTest ./varnish.nix { package = pkgs.varnish74; };
varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };
vault = handleTest ./vault.nix {};
vault-agent = handleTest ./vault-agent.nix {};

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

@ -56,11 +56,6 @@ in
version = "6.0.13";
hash = "sha256-DcpilfnGnUenIIWYxBU4XFkMZoY+vUK/6wijZ7eIqbo=";
};
# EOL 2024-09-15
varnish74 = common {
version = "7.4.3";
hash = "sha256-655DUH+Dbu8uMoAtRt08+S7KPVR7pLZA/aWbQHzbG4g=";
};
# EOL 2025-03-15
varnish75 = common {
version = "7.5.0";

4
pkgs/servers/varnish/modules.nix
View File

@ -41,10 +41,6 @@ in
version = "0.15.1";
hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
};
modules23 = common {
version = "0.23.0";
hash = "sha256-Dd1pLMmRC59iRRpReDeQJ8Sv00ojb8InvaMrb+iRv4I=";
};
modules24 = common {
version = "0.24.0";
hash = "sha256-2MfcrhhkBz9GyQxEWzjipdn1CBEqnCvC3t1G2YSauak=";

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

@ -1,4 +1,4 @@
{ callPackages, callPackage, varnish60, varnish74, varnish75 }: {
{ callPackages, callPackage, varnish60, varnish75 }: {
varnish60Packages = rec {
varnish = varnish60;
modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@ -13,10 +13,6 @@
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
};
};
varnish74Packages = rec {
varnish = varnish74;
modules = (callPackages ./modules.nix { inherit varnish; }).modules23;
};
varnish75Packages = rec {
varnish = varnish75;
modules = (callPackages ./modules.nix { inherit varnish; }).modules24;

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

@ -1228,6 +1228,8 @@ mapAliases {
vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
varnish74 = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
ventoy-bin = ventoy; # Added 2023-04-12
ventoy-bin-full = ventoy-full; # Added 2023-04-12

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

@ -13655,11 +13655,11 @@ with pkgs;
valum = callPackage ../development/web/valum { };
inherit (callPackages ../servers/varnish { })
varnish60 varnish74 varnish75;
varnish60 varnish75;
inherit (callPackages ../servers/varnish/packages.nix { })
varnish60Packages varnish74Packages varnish75Packages;
varnish60Packages varnish75Packages;
varnishPackages = varnish74Packages;
varnishPackages = varnish75Packages;
varnish = varnishPackages.varnish;
hitch = callPackage ../servers/hitch { };