varnish75: drop

varnish75 is EOL and vulnerable to CVE-2025-30346
This commit is contained in:
Thomas Gerbet 2025-03-29 16:10:15 +01:00
parent 26fa0a5536
commit a09af24025
6 changed files with 6 additions and 35 deletions

View file

@ -1410,7 +1410,6 @@ in
user-activation-scripts = handleTest ./user-activation-scripts.nix { };
user-enable-option = runTest ./user-enable-option.nix;
user-expiry = runTest ./user-expiry.nix;
<<<<<<< HEAD
user-home-mode = handleTest ./user-home-mode.nix { };
ustreamer = handleTest ./ustreamer.nix { };
uwsgi = handleTest ./uwsgi.nix { };
@ -1419,32 +1418,18 @@ in
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish60;
};
varnish75 = runTest {
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish75;
};
varnish76 = runTest {
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish76;
};
varnish77 = runTest {
imports = [ ./varnish.nix ];
_module.args.package = pkgs.varnish77;
};
vault = handleTest ./vault.nix { };
vault-agent = handleTest ./vault-agent.nix { };
vault-dev = handleTest ./vault-dev.nix { };
vault-postgresql = handleTest ./vault-postgresql.nix { };
=======
user-home-mode = handleTest ./user-home-mode.nix {};
ustreamer = handleTest ./ustreamer.nix {};
uwsgi = handleTest ./uwsgi.nix {};
v2ray = handleTest ./v2ray.nix {};
varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };
varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; };
varnish77 = handleTest ./varnish.nix { package = pkgs.varnish77; };
vault = handleTest ./vault.nix {};
vault-agent = handleTest ./vault-agent.nix {};
vault-dev = handleTest ./vault-dev.nix {};
vault-postgresql = handleTest ./vault-postgresql.nix {};
>>>>>>> 0a00164b4295 (varnish77: init at 7.7.0)
vaultwarden = discoverTests (import ./vaultwarden.nix);
vdirsyncer = handleTest ./vdirsyncer.nix { };
vector = handleTest ./vector { };

View file

@ -94,11 +94,6 @@ in
version = "6.0.13";
hash = "sha256-DcpilfnGnUenIIWYxBU4XFkMZoY+vUK/6wijZ7eIqbo=";
};
# EOL 2025-03-15
varnish75 = common {
version = "7.5.0";
hash = "sha256-/KYbmDE54arGHEVG0SoaOrmAfbsdgxRXHjFIyT/3K10=";
};
# EOL 2025-09-15
varnish76 = common {
version = "7.6.2";

View file

@ -55,10 +55,6 @@ in
version = "0.15.1";
hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
};
modules24 = common {
version = "0.24.0";
hash = "sha256-2MfcrhhkBz9GyQxEWzjipdn1CBEqnCvC3t1G2YSauak=";
};
modules25 = common {
version = "0.25.0";
hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";

View file

@ -2,7 +2,6 @@
callPackages,
callPackage,
varnish60,
varnish75,
varnish76,
varnish77,
}:
@ -21,10 +20,6 @@
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
};
};
varnish75Packages = rec {
varnish = varnish75;
modules = (callPackages ./modules.nix { inherit varnish; }).modules24;
};
varnish76Packages = rec {
varnish = varnish76;
modules = (callPackages ./modules.nix { inherit varnish; }).modules25;

View file

@ -1809,6 +1809,8 @@ mapAliases {
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
varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 22025-03-29
varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
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

View file

@ -5605,13 +5605,11 @@ with pkgs;
inherit (callPackages ../servers/varnish { })
varnish60
varnish75
varnish76
varnish77
;
inherit (callPackages ../servers/varnish/packages.nix { })
varnish60Packages
varnish75Packages
varnish76Packages
varnish77Packages
;