Merge: varnish76: drop (#407274)
This commit is contained in:
@@ -1424,10 +1424,6 @@ in
|
||||
imports = [ ./varnish.nix ];
|
||||
_module.args.package = pkgs.varnish60;
|
||||
};
|
||||
varnish76 = runTest {
|
||||
imports = [ ./varnish.nix ];
|
||||
_module.args.package = pkgs.varnish76;
|
||||
};
|
||||
varnish77 = runTest {
|
||||
imports = [ ./varnish.nix ];
|
||||
_module.args.package = pkgs.varnish77;
|
||||
|
||||
@@ -94,11 +94,6 @@ in
|
||||
version = "6.0.14";
|
||||
hash = "sha256-tZlBf3ppntxxYSufEJ86ot6ujvnbfIyZOu9B3kDJ72k=";
|
||||
};
|
||||
# EOL 2025-09-15
|
||||
varnish76 = common {
|
||||
version = "7.6.3";
|
||||
hash = "sha256-JwP2Ru6JO3iEa8t91LlrKPkSX7iq9+ilaS2k3+SEVGc=";
|
||||
};
|
||||
# EOL 2026-03-15
|
||||
varnish77 = common {
|
||||
version = "7.7.1";
|
||||
|
||||
@@ -55,10 +55,6 @@ in
|
||||
version = "0.15.1";
|
||||
hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
|
||||
};
|
||||
modules25 = common {
|
||||
version = "0.25.0";
|
||||
hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";
|
||||
};
|
||||
modules26 = common {
|
||||
version = "0.26.0";
|
||||
hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU=";
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
callPackages,
|
||||
callPackage,
|
||||
varnish60,
|
||||
varnish76,
|
||||
varnish77,
|
||||
}:
|
||||
{
|
||||
@@ -20,10 +19,6 @@
|
||||
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
|
||||
};
|
||||
};
|
||||
varnish76Packages = rec {
|
||||
varnish = varnish76;
|
||||
modules = (callPackages ./modules.nix { inherit varnish; }).modules25;
|
||||
};
|
||||
varnish77Packages = rec {
|
||||
varnish = varnish77;
|
||||
modules = (callPackages ./modules.nix { inherit varnish; }).modules26;
|
||||
|
||||
@@ -1919,6 +1919,8 @@ mapAliases {
|
||||
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
|
||||
varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
|
||||
varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
|
||||
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
|
||||
|
||||
@@ -4800,12 +4800,10 @@ with pkgs;
|
||||
|
||||
inherit (callPackages ../servers/varnish { })
|
||||
varnish60
|
||||
varnish76
|
||||
varnish77
|
||||
;
|
||||
inherit (callPackages ../servers/varnish/packages.nix { })
|
||||
varnish60Packages
|
||||
varnish76Packages
|
||||
varnish77Packages
|
||||
;
|
||||
varnishPackages = varnish77Packages;
|
||||
|
||||
Reference in New Issue
Block a user