diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:33 +0200 |
commit | 153a19df05133657dd3025812a544f8961c41b12 (patch) | |
tree | 9974b86334e11ffa884610dd0999a62b78e0ee96 /pkgs/servers | |
parent | ae2cf7c00877a3dd778b3e3cabfec682503303d5 (diff) | |
parent | 6755ab8b3442d6149e4bae5e142d516a506f6e45 (diff) | |
download | nixlib-153a19df05133657dd3025812a544f8961c41b12.tar nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.gz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.bz2 nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.lz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.xz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.zst nixlib-153a19df05133657dd3025812a544f8961c41b12.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/hydron/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/hydron/deps.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/memcached/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/rainloop/default.nix | 44 | ||||
-rw-r--r-- | pkgs/servers/search/groonga/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/pgbouncer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/pgroonga/default.nix | 8 |
9 files changed, 63 insertions, 18 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 6ccd849e1c8f..5665b0536543 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -66,7 +66,8 @@ wrapped-full = with luajitPackages; let luaPkgs = [ luasec luasocket # trust anchor bootstrap, prefill module lfs # prefill module - # TODO: cqueues and others for http2 module + # Almost all is for the 'http' module: + http cqueues fifo lpeg lpeg_patterns luaossl compat53 basexx ]; in runCommand unwrapped.name { diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 400f15565ef2..03fdf7908cc4 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-08-15"; + version = "2018-08-18"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "4c219dc016f18e11a50e52485cbeb28135921386"; - sha256 = "0xj705wdyajzli66p0cxvl47gx6z7nx9cbzm7lbbqn51qxw71p64"; + rev = "78257f1c1f34cdad1931531601163071f7f29aa9"; + sha256 = "0rpvbayx48xncy70vzbxn3cs0lslza0i3hxmywlngyl17da97bf0"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index 9b0890d36f40..c5d584f1bcd3 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54"; - sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3"; + rev = "aaf60122140d3fcf75376d319f0554393160eb50"; + sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv"; }; } ] diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index a9d8714476cb..9790df9ce765 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.9"; + version = "1.5.10"; name = "memcached-${version}"; src = fetchurl { url = "https://memcached.org/files/${name}.tar.gz"; - sha256 = "01hx4hs8lgmjzpqj1iv5fpdwv1ymrii6bp4nh1s0mjvipxymgwsa"; + sha256 = "0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix new file mode 100644 index 000000000000..76f3ded78086 --- /dev/null +++ b/pkgs/servers/rainloop/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, unzip, dataPath ? "/etc/rainloop" }: let + common = { edition, sha256 }: + stdenv.mkDerivation (rec { + name = "rainloop-${edition}-${version}"; + version = "1.12.1"; + + buildInputs = [ unzip ]; + + unpackPhase = '' + mkdir rainloop + unzip -q -d rainloop $src + ''; + + src = fetchurl { + url = "https://github.com/RainLoop/rainloop-webmail/releases/download/v${version}/rainloop-${edition}${stdenv.lib.optionalString (edition != "") "-"}${version}.zip"; + sha256 = sha256; + }; + + installPhase = '' + mkdir $out + cp -r rainloop/* $out + rm -rf $out/data + ln -s ${dataPath} $out/data + ''; + + meta = with stdenv.lib; { + description = "Simple, modern & fast web-based email client"; + homepage = "https://www.rainloop.net"; + downloadPage = https://github.com/RainLoop/rainloop-webmail/releases; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ das_j ]; + }; + }); + in { + rainloop-community = common { + edition = "community"; + sha256 = "06w1vxqpcj2j8dzzjqh6azala8l46hzy85wcvqbjdlj5w789jzsx"; + }; + rainloop-standard = common { + edition = ""; + sha256 = "1fbnpk7l2fbmzn31vx36caqg9xm40g4hh4mv3s8d70slxwhlscw0"; + }; + } diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index a609476c41aa..439acd927e31 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, mecab, kytea, libedit, pkgconfig -, suggestSupport ? false, zeromq, libevent, libmsgpack +, suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { [ pkgconfig mecab kytea libedit ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib - ++ optionals suggestSupport [ zeromq libevent libmsgpack ]; + ++ optionals suggestSupport [ zeromq libevent msgpack ]; configureFlags = with stdenv.lib; optional zlibSupport "--with-zlib" diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 121e42f7a978..da6143c21f0d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ galeraLibs = buildEnv { }; common = rec { # attributes common to both builds - version = "10.2.16"; + version = "10.2.17"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1i2dwpp96ywjk147qqpcad8vqcy4rxmfbv2cb8ww3sffpa9yx0n1"; + sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 7906546ec1ca..ef8b77ad1176 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgbouncer-${version}"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz"; - sha256 = "1j4d7rkivg3vg27pvirigq9cy4v7pi48x7w57baq131c5lmdx2zs"; + sha256 = "012zh9l68r1ramrd66yam6y3al0i85dvvg4wwwkn6qwq6dhskv1r"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index a27f0ef0824c..f4c7bfb1b85f 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }: +{ stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }: stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.0.6"; + version = "2.0.9"; src = fetchurl { url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68"; + sha256 = "0dfkhl2im4cn2lczbsvb8zyylrzlm0vqk9ixjsalcaqxgxph2dpz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ postgresql libmsgpack groonga ]; + buildInputs = [ postgresql msgpack groonga ]; makeFlags = [ "HAVE_MSGPACK=1" ]; |