Commit f9f7fd20 authored by Raito Bezarius's avatar Raito Bezarius
Browse files

varnish72: drop, varnish73: drop 

All of them are EOL according to https://endoflife.date/varnish
parent 35c640b1

nixos/tests/all-tests.nix

+0 −2
Original line number Diff line number Diff line
@@ -855,8 +855,6 @@ in { 
  uwsgi = handleTest ./uwsgi.nix {};

  v2ray = handleTest ./v2ray.nix {};

  varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };

  varnish72 = handleTest ./varnish.nix { package = pkgs.varnish72; };

  varnish73 = handleTest ./varnish.nix { package = pkgs.varnish73; };

  vault = handleTest ./vault.nix {};

  vault-agent = handleTest ./vault-agent.nix {};

  vault-dev = handleTest ./vault-dev.nix {};

pkgs/servers/varnish/default.nix

+1 −11
Original line number Diff line number Diff line
@@ -51,19 +51,9 @@ let 
    };

in

{

  # EOL TBA

  # EOL (LTS) TBA

  varnish60 = common {

    version = "6.0.11";

    hash = "sha256-UVkA2+tH/9MOs5BlyuAzFnmD7Pm9A6lDWic2B+HRKNs=";

  };

  # EOL 2023-09-15

  varnish72 = common {

    version = "7.2.1";

    hash = "sha256-TZN9FyCo7BnFM/ly2TA6HJiJt7/KdDeJOuXCfPIEqUA=";

  };

  # EOL 2024-03-15

  varnish73 = common {

    version = "7.3.0";

    hash = "sha256-4tu7DsJwqQZHw4aGbm4iaZOu1G5I3nUacruBlzfxSuc=";

  };

}

pkgs/servers/varnish/packages.nix

+1 −9
Original line number Diff line number Diff line 
{ callPackages, callPackage, varnish60, varnish72, varnish73, fetchFromGitHub }: {

{ callPackages, callPackage, varnish60, fetchFromGitHub }: {

  varnish60Packages = rec {

    varnish = varnish60;

    modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@@ -13,12 +13,4 @@ 
      sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";

    };

  };

  varnish72Packages = rec {

    varnish = varnish72;

    modules = (callPackages ./modules.nix { inherit varnish; }).modules20;

  };

  varnish73Packages = rec {

    varnish = varnish73;

    modules = (callPackages ./modules.nix { inherit varnish; }).modules22;

  };

}

pkgs/top-level/aliases.nix

+4 −0
Original line number Diff line number Diff line
@@ -853,6 +853,10 @@ mapAliases ({ 
  vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25

  vkBasalt = vkbasalt; # Added 2022-11-22

  vte_290 = throw "'vte_290' has been renamed to/replaced by 'vte'"; # Added 2023-01-05

  varnish72 = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09

  varnish73 = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09

  varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09

  varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09

  inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17



  ### W ###

pkgs/top-level/all-packages.nix

+3 −3
Original line number Diff line number Diff line
@@ -14849,11 +14849,11 @@ with pkgs; 
  valum = callPackage ../development/web/valum { };















  inherit (callPackages ../servers/varnish { })













    varnish60 varnish72 varnish73;













    varnish60;















  inherit (callPackages ../servers/varnish/packages.nix { })













    varnish60Packages varnish72Packages varnish73Packages;













    varnish60Packages;



























  varnishPackages = varnish72Packages;













  varnishPackages = varnish60Packages;















  varnish = varnishPackages.varnish;





























  hitch = callPackage ../servers/hitch { };