Unverified Commit 0a374322 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

varnish74: drop (#352492)

parents ea6f23fb 132cb2a9

nixos/tests/all-tests.nix

+0 −1
Original line number Diff line number Diff line
@@ -1100,7 +1100,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 {};

pkgs/servers/varnish/default.nix

+0 −5
Original line number Diff line number Diff line
@@ -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";

pkgs/servers/varnish/modules.nix

+0 −4
Original line number Diff line number Diff line
@@ -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=";

pkgs/servers/varnish/packages.nix

+1 −5
Original line number Diff line number Diff line 
{ 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;

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -1263,6 +1263,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