Commit dbe4e6d2 authored by ajs124's avatar ajs124
Browse files

varnish74: init at 7.4.1

parent f9f7fd20

nixos/tests/all-tests.nix

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

  v2ray = handleTest ./v2ray.nix {};

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

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

  vault = handleTest ./vault.nix {};

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

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

pkgs/servers/varnish/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -56,4 +56,9 @@ in 
    version = "6.0.11";

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

  };

  # EOL 2024-09-15

  varnish74 = common {

    version = "7.4.1";

    hash = "sha256-h02Deq9JuPJxjLYLjIx5AOnqEMJk8hjIjNZy1Zb0uJ8=";

  };

}

pkgs/servers/varnish/packages.nix

+5 −1
Original line number Diff line number Diff line 
{ callPackages, callPackage, varnish60, fetchFromGitHub }: {

{ callPackages, callPackage, varnish60, varnish74, fetchFromGitHub }: {

  varnish60Packages = rec {

    varnish = varnish60;

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

    };

  };

  varnish74Packages = rec {

    varnish = varnish74;

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

  };

}

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;













    varnish60 varnish74;















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













    varnish60Packages;













    varnish60Packages varnish74Packages;



























  varnishPackages = varnish60Packages;













  varnishPackages = varnish74Packages;















  varnish = varnishPackages.varnish;





























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