diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
commit | 747ebe3f660ea4a6e7bd03831f4e95a66d59b526 (patch) | |
tree | b9575026aa7949f51541135be0059b54eda07bbe /pkgs/servers | |
parent | 4c46f13f15c602a88dfd87a37acdc94653232a1d (diff) | |
parent | 00fc66dc7dcda7fc38a9cc7f4dbd7bb66f28c5f9 (diff) | |
download | nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.gz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.bz2 nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.lz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.xz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.zst nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/ftp/bftpd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/gatling/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/plugins/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/cstore_fdw/default.nix | 32 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/pg_cron/default.nix | 31 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/pg_hll/default.nix | 31 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/timescaledb/default.nix | 36 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/topn/default.nix | 32 | ||||
-rw-r--r-- | pkgs/servers/tvheadend/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/web-apps/matomo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/web-apps/shaarli/default.nix | 4 |
16 files changed, 170 insertions, 36 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index a222805fc459..09fda1b81b8b 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,16 +12,16 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "0b9caee03d7cd30e1dc8fa0ce5fafade31fc1785314986bbf77cad446522a1b3"; + sha256 = "1yhlwvpl81klyfb8hhvrhii99q7wvydi3vandmq9j7dvig6z1dvv"; }; outputs = [ "out" "dev" ]; - configurePhase = ":"; + configurePhase = "patchShebangs scripts/"; nativeBuildInputs = [ pkgconfig which hexdump ]; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 865b6f3faba1..38fb7d250e34 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bftpd"; - version = "4.8"; + version = "4.9"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "1zlsajj6wjd9wcijzngmafhy2gr3sm5rphsr5n44rlmx1jdkk00c"; + sha256 = "13pjil9cjggpi773m0516lszyqvwzlgcrmmj8yn9nc24rbxwvn6d"; }; buildInputs = []; preConfigure = '' diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 007cfc967794..0599d3affc89 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "0gviv9x4w4i8d26d8vyrr8zk4p5hdx63rxpzqw769cmhvvy8r3g2"; + sha256 = "1vi2bf2spak70qqc1c673a7pwmzq01gmli43xwhrwdw7l2ig4wj9"; }; buildInputs = [ apacheHttpd python2 ]; diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 549beec674cc..19b2d01f5be8 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, libowfat, zlib, openssl }: let - version = "0.13"; + version = "0.15"; in stdenv.mkDerivation rec { name = "gatling-${version}"; src = fetchurl { - url = "http://dl.fefe.de/${name}.tar.bz2"; - sha256 = "0icjx20ws8gqxgpm77dx7p9zcwi1fv162in6igx04rmnyzyla8dl"; + url = "https://www.fefe.de/gatling/${name}.tar.xz"; + sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg"; }; buildInputs = [ libowfat zlib openssl.dev ]; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index af9ff3b257b1..e98c58c891a1 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; maintainers = [ maintainers.rickynils ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 4989a01c9e39..deac45eadb62 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "check_ssl_cert-${version}"; - version = "1.51.0"; + version = "1.64.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "07g4dhwp1plzmlqazapn0s0hysmf3kk0pa2x0wns482xm1v1mr05"; + sha256 = "0pq297sbz9hzcaccnnsfmra0bac81cki9xfrnb22a1hgfhqjxy5r"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 808257ca121f..a0f7341571ce 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -62,7 +62,7 @@ _EOF ''; meta = { - description = "Official monitoring plugins for Nagios/Ichinga/Sensu and others."; + description = "Official monitoring plugins for Nagios/Icinga/Sensu and others."; homepage = https://www.monitoring-plugins.org; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 662117800219..07489b627288 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.8"; + version = "4.0.9"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "1b9jqacckx4qqyz905mnclxfcpsvrwc507n6zr4r4canq6w3h37z"; + sha256 = "0465bv6yxnwmas3wzg07vmrprv2pxhnr56hn5pxrybwf66y76kyz"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix new file mode 100644 index 000000000000..70b8abf2502d --- /dev/null +++ b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, postgresql, protobufc }: + +stdenv.mkDerivation rec { + name = "cstore_fdw-${version}"; + version = "1.6.0"; + + nativeBuildInputs = [ protobufc ]; + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "cstore_fdw"; + rev = "refs/tags/v${version}"; + sha256 = "08jbx4hs2r742flilydp0ajjwv8ffnvq82nidh48irrfa4i7n0l0"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Columnar storage for PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/pg_cron/default.nix new file mode 100644 index 000000000000..c5a7a40546ef --- /dev/null +++ b/pkgs/servers/sql/postgresql/pg_cron/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + name = "pg_cron-${version}"; + version = "1.0.2"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "pg_cron"; + rev = "refs/tags/v${version}"; + sha256 = "0z743bbal9j0pvqskznfj0zvjsqvdl7p90d4fdrl0sc0crc3nvyx"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Run Cron jobs through PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/pg_hll/default.nix new file mode 100644 index 000000000000..6c453f6a40c3 --- /dev/null +++ b/pkgs/servers/sql/postgresql/pg_hll/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + name = "pg_hll-${version}"; + version = "2.10.2-${builtins.substring 0 7 src.rev}"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "postgresql-hll"; + rev = "9af41684d479a3097bab87d04936702c9e6baf5c"; + sha256 = "044x9v9kjhxb0idqb9f5i7c3yygxxsqliswl4kspqy9f9qcblckl"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "HyperLogLog for PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index 223bd6e470b9..e1a4aed3b7e4 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, postgresql }: +{ stdenv, fetchFromGitHub, cmake, postgresql }: # # To enable on NixOS: # config.services.postgresql = { @@ -8,29 +8,37 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.6.0"; + version = "0.9.1"; + nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql ]; src = fetchFromGitHub { - owner = "timescale"; - repo = "timescaledb"; - rev = version; - sha256 = "061z1ll3x7ca7fj12rl2difkdvmqykksqhpsql552qkkylg7iq4d"; + owner = "timescale"; + repo = "timescaledb"; + rev = "refs/tags/${version}"; + sha256 = "00k8fk5a1xpv9nxlmafnngk31wh80h6m72vsl1hnyq7nhby7ylic"; }; - installPhase = '' - mkdir -p $out/bin - install -D timescaledb.so -t $out/lib - install -D timescaledb.control -t $out/share/extension - cp -dpR sql/* $out/share/extension/ + # Fix the install phase which tries to install into the pgsql extension dir, + # and cannot be manually overridden. This is rather fragile but works OK. + patchPhase = '' + for x in CMakeLists.txt sql/CMakeLists.txt; do + substituteInPlace "$x" \ + --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\"" + done + + for x in src/CMakeLists.txt src/loader/CMakeLists.txt; do + substituteInPlace "$x" \ + --replace 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\"" + done ''; meta = with stdenv.lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; - homepage = https://www.timescale.com/; + homepage = https://www.timescale.com/; maintainers = with maintainers; [ volth ]; - platforms = platforms.linux; - license = licenses.postgresql; + platforms = platforms.linux; + license = licenses.postgresql; }; } diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/topn/default.nix new file mode 100644 index 000000000000..6886c80cf50d --- /dev/null +++ b/pkgs/servers/sql/postgresql/topn/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, postgresql, protobufc }: + +stdenv.mkDerivation rec { + name = "pg_topn-${version}"; + version = "2.0.2"; + + nativeBuildInputs = [ protobufc ]; + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "citusdata"; + repo = "postgresql-topn"; + rev = "refs/tags/v${version}"; + sha256 = "00hc3hgnqv9xaalizbcvprb7s55sydj2qgk3rhgrdlwg2g025h62"; + }; + + installPhase = '' + mkdir -p $out/{lib,share/extension} + + cp *.so $out/lib + cp *.sql $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Efficient querying of 'top values' for PostgreSQL"; + homepage = https://www.citusdata.com/; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.linux; + license = licenses.agpl3; + }; +} diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index c5e2b45fe96d..c0a3b5a28c31 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -3,7 +3,7 @@ , which, zlib }: let - version = "4.2.5"; + version = "4.2.6"; in stdenv.mkDerivation rec { name = "tvheadend-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "tvheadend"; repo = "tvheadend"; rev = "v${version}"; - sha256 = "199b0xm4lfdspmrirvzzg511yh358awciz23zmccvlvq86b548pz"; + sha256 = "0rnhk0r34mfmz3cnf735nzkkyal7pnv16hfyrs0g4v5rk99rlab3"; }; buildInputs = [ diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index c99b20a46bd5..c8a918c2bd22 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matomo-${version}"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again # url = "https://builds.matomo.org/${name}.tar.gz"; url = "https://builds.matomo.org/piwik-${version}.tar.gz"; - sha256 = "1ybzj3kk0x29nv8c6xnhir5d9dr0q0fl1vnm4i7zvhml73ryqk0f"; + sha256 = "1hnja8mvjvlbqgw7maa76lxd5hxxg7d5ggq9wyrff25mapj398wc"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 4c4cd21cddf4..8f6722ed86ec 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "133ffxyw9bf61rky01d3rkkm34np5z4kwmgwx6ygshl83y0ylnwf"; + sha256 = "0vi59988bjxb1cyifh0fynpxa7l6cl0v57hrxima5c9iid10pw54"; }; outputs = [ "out" "doc" ]; |