Unverified Commit b6ec248d authored by ajs124's avatar ajs124 Committed by GitHub
Browse files

Merge pull request #233007 from LeSuisse/varnish73-init 

varnish73: init at 7.3.0
parents d64b0605 16c6122a

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -792,6 +792,7 @@ in { 
  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

+5 −0
Original line number Diff line number Diff line
@@ -61,4 +61,9 @@ in 
    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/modules.nix

+4 −0
Original line number Diff line number Diff line
@@ -45,4 +45,8 @@ in 
    version = "0.20.0";

    sha256 = "sha256-3eH3qCa24rWqYXsTTDmm/9LjBMxcxUuozuRzZ3e8cUo=";

  };

  modules22 = common {

    version = "0.22.0";

    sha256 = "sha256-eoa6i6AuOS4pxQKA/lbJnwFc39cRiLqnBSpPM4Oitrc=";

  };

}

pkgs/servers/varnish/packages.nix

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

{ callPackages, callPackage, varnish60, varnish72, varnish73, fetchFromGitHub }: {

  varnish60Packages = rec {

    varnish = varnish60;

    modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@@ -17,4 +17,8 @@ 
    varnish = varnish72;

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

  };

  varnish73Packages = rec {

    varnish = varnish73;

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

  };

}

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -13894,9 +13894,9 @@ with pkgs; 
  valum = callPackage ../development/web/valum { };















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













    varnish60 varnish72;













    varnish60 varnish72 varnish73;















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













    varnish60Packages varnish72Packages;













    varnish60Packages varnish72Packages varnish73Packages;





























  varnishPackages = varnish72Packages;















  varnish = varnishPackages.varnish;