Skip to content

Commit a7b6b1e

Browse files
authored
Merge: varnish76: drop (#407274)
2 parents 872bd5a + 2c3bb13 commit a7b6b1e

File tree

6 files changed

+2
-20
lines changed

6 files changed

+2
-20
lines changed

nixos/tests/all-tests.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,10 +1424,6 @@ in
14241424
imports = [ ./varnish.nix ];
14251425
_module.args.package = pkgs.varnish60;
14261426
};
1427-
varnish76 = runTest {
1428-
imports = [ ./varnish.nix ];
1429-
_module.args.package = pkgs.varnish76;
1430-
};
14311427
varnish77 = runTest {
14321428
imports = [ ./varnish.nix ];
14331429
_module.args.package = pkgs.varnish77;

pkgs/servers/varnish/default.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ in
9494
version = "6.0.14";
9595
hash = "sha256-tZlBf3ppntxxYSufEJ86ot6ujvnbfIyZOu9B3kDJ72k=";
9696
};
97-
# EOL 2025-09-15
98-
varnish76 = common {
99-
version = "7.6.3";
100-
hash = "sha256-JwP2Ru6JO3iEa8t91LlrKPkSX7iq9+ilaS2k3+SEVGc=";
101-
};
10297
# EOL 2026-03-15
10398
varnish77 = common {
10499
version = "7.7.1";

pkgs/servers/varnish/modules.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ in
5555
version = "0.15.1";
5656
hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
5757
};
58-
modules25 = common {
59-
version = "0.25.0";
60-
hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";
61-
};
6258
modules26 = common {
6359
version = "0.26.0";
6460
hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU=";

pkgs/servers/varnish/packages.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
callPackages,
33
callPackage,
44
varnish60,
5-
varnish76,
65
varnish77,
76
}:
87
{
@@ -20,10 +19,6 @@
2019
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
2120
};
2221
};
23-
varnish76Packages = rec {
24-
varnish = varnish76;
25-
modules = (callPackages ./modules.nix { inherit varnish; }).modules25;
26-
};
2722
varnish77Packages = rec {
2823
varnish = varnish77;
2924
modules = (callPackages ./modules.nix { inherit varnish; }).modules26;

pkgs/top-level/aliases.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1919,6 +1919,8 @@ mapAliases {
19191919
varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
19201920
varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 22025-03-29
19211921
varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
1922+
varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
1923+
varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
19221924
vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
19231925
ventoy-bin = ventoy; # Added 2023-04-12
19241926
ventoy-bin-full = ventoy-full; # Added 2023-04-12

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4800,12 +4800,10 @@ with pkgs;
48004800

48014801
inherit (callPackages ../servers/varnish { })
48024802
varnish60
4803-
varnish76
48044803
varnish77
48054804
;
48064805
inherit (callPackages ../servers/varnish/packages.nix { })
48074806
varnish60Packages
4808-
varnish76Packages
48094807
varnish77Packages
48104808
;
48114809
varnishPackages = varnish77Packages;

0 commit comments

Comments
 (0)