diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
| commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
| tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/servers/varnish/packages.nix | |
| parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
| parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
| download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip | |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/varnish/packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/servers/varnish/packages.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/servers/varnish/packages.nix b/nixpkgs/pkgs/servers/varnish/packages.nix index 9daa0f8ac59d..1d0b3e45da7a 100644 --- a/nixpkgs/pkgs/servers/varnish/packages.nix +++ b/nixpkgs/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackages, callPackage, varnish60, varnish72, varnish73, fetchFromGitHub }: { +{ callPackages, callPackage, varnish60, varnish74, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; @@ -13,12 +13,8 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish72Packages = rec { - varnish = varnish72; - modules = (callPackages ./modules.nix { inherit varnish; }).modules20; - }; - varnish73Packages = rec { - varnish = varnish73; - modules = (callPackages ./modules.nix { inherit varnish; }).modules22; + varnish74Packages = rec { + varnish = varnish74; + modules = (callPackages ./modules.nix { inherit varnish; }).modules23; }; } |