diff options
| -rw-r--r-- | nixos/tests/all-tests.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/varnish/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/servers/varnish/modules.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/varnish/packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
5 files changed, 17 insertions, 3 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 982f4315ca32d..3718eea4228ad 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -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 {}; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 89b1dd7f550e8..82a1acf44ca3e 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -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="; + }; } diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 018127c96913f..4a921600294ca 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -45,4 +45,8 @@ in version = "0.20.0"; sha256 = "sha256-3eH3qCa24rWqYXsTTDmm/9LjBMxcxUuozuRzZ3e8cUo="; }; + modules22 = common { + version = "0.22.0"; + sha256 = "sha256-eoa6i6AuOS4pxQKA/lbJnwFc39cRiLqnBSpPM4Oitrc="; + }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 71a7af2426f5d..9daa0f8ac59d9 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ 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; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eba7d14d8969..20ff64f9b3b5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |