BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

varnish70: init at 7.0.0

Browse source
This commit is contained in:
ajs124 2021-09-15 22:45:58 +02:00
parent 7017a66200
commit eba8f7e3d5
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/servers/varnish/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils
{ lib, stdenv, fetchurl, pcre, pcre2, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils
, python3, makeWrapper }:
let
@ -16,8 +16,10 @@ let
nativeBuildInputs = with python3.pkgs; [ pkg-config docutils sphinx ];
buildInputs = [
pcre libxslt groff ncurses readline libedit makeWrapper python3
];
libxslt groff ncurses readline libedit makeWrapper python3
]
++ lib.optional (lib.versionOlder version "7") pcre
++ lib.optional (lib.versionAtLeast version "7") pcre2;
buildFlags = [ "localstatedir=/var/spool" ];
@ -52,4 +54,8 @@ in
version = "6.5.2";
sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx";
};
varnish70 = common {
version = "7.0.0";
sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc";
};
}

15
pkgs/servers/varnish/packages.nix
View file

@ -1,4 +1,4 @@
{ callPackage, varnish60, varnish65, fetchFromGitHub }: {
{ callPackage, varnish60, varnish65, varnish70, fetchFromGitHub }: {
varnish60Packages = rec {
varnish = varnish60;
digest = callPackage ./digest.nix {
@ -25,4 +25,17 @@
sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88";
};
};
varnish70Packages = rec {
varnish = varnish70;
digest = callPackage ./digest.nix {
inherit varnish;
version = "6.6";
sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn";
};
dynamic = callPackage ./dynamic.nix {
inherit varnish;
version = "2.4.0";
sha256 = "1g53zblyxi1jivwppmpdqhi5xnzapsfib453sxyqbc5dfs7fijxr";
};
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -10406,9 +10406,9 @@ with pkgs;
valum = callPackage ../development/web/valum { };
inherit (callPackages ../servers/varnish { })
varnish60 varnish65;
varnish60 varnish65 varnish70;
inherit (callPackages ../servers/varnish/packages.nix { })
varnish60Packages varnish65Packages;
varnish60Packages varnish65Packages varnish70Packages;
varnishPackages = varnish65Packages;
varnish = varnishPackages.varnish;