diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-12-01 06:01:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 06:01:17 +0000 |
| commit | 3bebe2a3f2e00d0ab36546d44f522042c52695f6 (patch) | |
| tree | 8a3f06766873c3ae382ef7c8a490e3f16bff6065 /pkgs/servers | |
| parent | 80fce0f4a796aee5d7caa43decca421d9cafc293 (diff) | |
| parent | 3f03bdbceb4953c4b9e1cc672e90c96f9e95d2bc (diff) | |
| download | nixpkgs-3bebe2a3f2e00d0ab36546d44f522042c52695f6.tar nixpkgs-3bebe2a3f2e00d0ab36546d44f522042c52695f6.tar.gz nixpkgs-3bebe2a3f2e00d0ab36546d44f522042c52695f6.tar.bz2 nixpkgs-3bebe2a3f2e00d0ab36546d44f522042c52695f6.tar.lz nixpkgs-3bebe2a3f2e00d0ab36546d44f522042c52695f6.tar.xz nixpkgs-3bebe2a3f2e00d0ab36546d44f522042c52695f6.tar.zst nixpkgs-3bebe2a3f2e00d0ab36546d44f522042c52695f6.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/search/groonga/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/tailscale/default.nix | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index b405a4c2f09..f9e24a95674 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,21 +1,21 @@ { lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config -, suggestSupport ? false, zeromq, libevent, msgpack +, suggestSupport ? false, zeromq, libevent, msgpack, openssl , lz4Support ? false, lz4 -, zlibSupport ? false, zlib +, zlibSupport ? true, zlib }: stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.5"; + version = "11.0.9"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-oBABhMKLezjPeHkWfqesy+ze+CPnWfmS17vCKC7fWEU="; + sha256 = "sha256-yE/Ok0QNY9+a4vfNJWZjR4W8E/i+lw7T85X2+oOw8m4="; }; buildInputs = with lib; - [ pkg-config mecab kytea libedit ] + [ pkg-config mecab kytea libedit openssl ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 86c9e54526f..c0d05fc1769 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "10rj35xxcfg10nvq3zqxm25hfb3hw58z4dda1b4hh8ibyz2489vy"; + sha256 = "sha256-XE669KfHEyY5TghMUC0GcIqdPTsdAs04pA/t84k+i2E="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 85f292711ef..2a0165a9fe6 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.14.6"; + version = "1.18.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-Mvt2j1AAkENT0krl2PbtzM7HXgs4miYXDchFm+8cspY="; + sha256 = "sha256-DmgCuv10TiB4UYISthJ1UghuPdvRKYl0cU9VxDvFjMc="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "sha256-v/jcNKcjE/c4DuxwfCy09xFTDk3yysP4tBmVW69FI4o="; + vendorSha256 = "sha256-ulgTwnuisnkQf0WLQhZ70MwuOpZuroh7ShxBGyv0d0k="; doCheck = false; |