diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-09 14:00:27 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-09 14:00:27 +0200 |
commit | 9bd78cb0488040ea996b27e82135396a45325af5 (patch) | |
tree | fe8e48ceab8d69e7e51bd1f04ec6aae0ca7dafec /pkgs/servers | |
parent | a12aeebedbac1bbb02d1beec35925c433cf022f5 (diff) | |
parent | 246c223e877989c5763ce905bfa42b3f32fe2c18 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
32 files changed, 205 insertions, 138 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 00f83cba8db2..9538747da6d1 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.16"; + version = "3.7.17"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "12s1s4zz3fxvb5ah5v6gmaq1kgd41pv9nahsdswa7svbgdc8lykz"; + sha256 = "1ychgvjbi6ikapfcp4rgwa0vihhs1f34c2advb7833jym8alazrr"; }; buildInputs = diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 349502289207..84985b8f0eb3 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -1,20 +1,35 @@ -{ stdenv, lib, fetchurl, jre, makeWrapper, bash, gnused }: +{ stdenv, lib, fetchurl, fetchFromGitHub +, jre, makeWrapper, bash, gnused }: -let - scalaVersion = "2.12"; -in stdenv.mkDerivation rec { name = "confluent-platform-${version}"; - version = "5.2.1"; + version = "5.3.0"; + scalaVersion = "2.12"; src = fetchurl { url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz"; - sha256 = "11fdcc557aca782e87352ed6e655c37c71fb7b3a003796ee956970b01dedbbb1"; + sha256 = "14cilq63fib5yvj40504aj6wssi7xw4f7c2jadlzdmdxzh4ixqmp"; + }; + + confluentCli = fetchFromGitHub { + owner = "confluentinc"; + repo = "confluent-cli"; + rev = "v${version}"; + sha256 = "18yvp56b8l074qfkgr4afirgd43g8b023n9ija6dnk6p6dib1f4j"; }; buildInputs = [ jre makeWrapper bash ]; installPhase = '' + cp -R $confluentCli confluent-cli + chmod -R +w confluent-cli + + ( + export CONFLUENT_HOME=$PWD + cd confluent-cli + make install + ) + mkdir -p $out cp -R bin etc share src $out rm -rf $out/bin/windows @@ -32,7 +47,7 @@ stdenv.mkDerivation rec { wrapProgram $p \ --set JAVA_HOME "${jre}" \ --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \ - --prefix PATH : "${bash}/bin:${gnused}/bin" + --prefix PATH : "${jre}/bin:${bash}/bin:${gnused}/bin" done ''; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 4c4a45cca793..74d0d1341d66 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,14 +8,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.14.3"; in +let version = "9.14.4"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1ymxr38c62w6961j8g2vllnv0s72z7zk4b2j2k8ixdh1rymqm1yf"; + sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 34791cfdd71d..7a6c9de885a8 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -23,11 +23,11 @@ exportLuaPathsFor = luaPkgs: '' unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "2fe470f9bb1007667cdd448f758087244b7195a0234c2b100a9beeed0a2d3e68"; + sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 684dc02dcf3d..fcddd569b361 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.14"; + version = "4.2.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "055zhxp58883722dr9y5bi91bk1ypc0whdyi96nklsga7gxbikkz"; + sha256 = "1hn2nw8v6gccwxwm36xczsac4bhxf8b8r7akri2wdp3gh70p4g7h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 11bfb99782d3..9216464f1e49 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { name = "icingaweb2-${version}"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "0xcsf45m85d4ww5y2d5i73rjbp3hmc8lljc67lz9fl6f90y9gb22"; + sha256 = "0akz2v9zfdchagnzdqcvzrxyw9bkmg8pp23wwdpwdrw67z2931zj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 1091e31cf9f6..d2ead585e7d0 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.11.457"; + version = "0.11.559"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "139ga5qra6jrn3mkp08a5p495alxq78a8imfj4k8ywv1s05kw7dw"; + sha256 = "1ds263q92igvgn0dirl506cmrzy374msaxl1x13gax0i0ggf09mq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 88c973de0d1b..a537a4c6d00c 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ coreutils db openssl perl pcre ] ++ stdenv.lib.optional enableLDAP openldap - ++ stdenv.lib.optionals enableMySQL [ mysql zlib ] + ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ] ++ stdenv.lib.optional enableAuthDovecot dovecot ++ stdenv.lib.optional enablePAM pam; preBuild = '' - ${stdenv.lib.optionalString enableMySQL "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${mysql}/share/mysql/pkgconfig/"} sed ' s:^\(BIN_DIRECTORY\)=.*:\1='"$out"'/bin: s:^\(CONFIGURE_FILE\)=.*:\1=/etc/exim.conf: @@ -52,10 +51,10 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: - s:^# \(LOOKUP_MYSQL_PC=mariadb\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql}/include/mysql/: + s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/: ''} ${stdenv.lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 70ba29dfe033..c9e6da89d93e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.2.5"; + version = "6.3.2"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "03wign7dkc2a9267mmqicvvzgya0g1i9ygr0dz3jvks2k1yhlv2j"; + sha256 = "03jhygd3h211dr3dgdg4mi13sj1rib333x436kv14v8xd8rsl162"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "19zc9x1gkmdr7ijsrhrlln5cib20iyx0vgk0z79d8qyhq69nxfs8"; + sha256 = "18khy0ki128mswy4viwbb53904ljrgj0y0qv076nn8m2zbyddyp9"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 3459a5fe8f7f..92713a43ea22 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0rwzlj6qp8hq931rw6s255b33ggmc2fcxs74g9x2zxwcvklg1a5v"; + sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57"; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 52620478339a..1b4ffd61ec78 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "1vgwsg81xcxh7pcdc667mfviwwpzsm4lpllykf78vfahi9qmwffn"; + sha256 = "0wfv54ny557mjajjdf0lyq5sbf9m7y50ggm7s2v30c639i0swyrc"; }; cargoSha256 = "06s9194lvwd7lynxnsrjfbjfj87ngvjbqjhx3idf7d1w9mgi4ysw"; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 12684eab551a..11695d753e28 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,39 +1,60 @@ -{ stdenv, fetchFromGitHub -, openssl, zlib, readline, cmake, python }: +{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }: let -in stdenv.mkDerivation rec { - version = "3.3.19"; - name = "arangodb-${version}"; - - src = fetchFromGitHub { - repo = "arangodb"; - owner = "arangodb"; - rev = "v${version}"; - sha256 = "1qg4lqnn5x0xsmkq41mjj301mfh76r8ys1rkzhinxlq30jld3155"; - }; - - buildInputs = [ - openssl zlib readline python - ]; - - nativeBuildInputs = [ cmake ]; - - postPatch = '' - sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi - ''; - - configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://github.com/arangodb/arangodb; - description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = [ maintainers.flosse ]; + common = { version, sha256 }: stdenv.mkDerivation { + pname = "arangodb"; + inherit version; + + src = fetchFromGitHub { + repo = "arangodb"; + owner = "arangodb"; + rev = "v${version}"; + inherit sha256; + }; + + nativeBuildInputs = [ cmake python2 perl which ]; + buildInputs = [ openssl zlib snappy lzo ]; + + # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory" + dontFixCmake = lib.versionAtLeast version "3.5"; + NIX_CFLAGS_COMPILE = lib.optionals (lib.versionAtLeast version "3.5") [ "-Wno-error" ]; + preConfigure = lib.optionalString (lib.versionAtLeast version "3.5") "patchShebangs utils"; + + postPatch = '' + sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi + + # with nixpkgs, it has no sense to check for a version update + substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" "" + substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" "" + ''; + + cmakeFlags = [ + # do not set GCC's -march=xxx based on builder's /proc/cpuinfo + "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" + # also avoid using builder's /proc/cpuinfo + ] ++ + { "westmere" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "sandybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "ivybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "haswell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "broadwell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "skylake" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + "skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = https://www.arangodb.com; + description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; + }; }; +in { + arangodb_3_2 = common { version = "3.2.18"; sha256 = "05mfrx1g6dh1bzzqs23nvk0rg3v8y2dhdam4lym55pzlhqa7lf0x"; }; + arangodb_3_3 = common { version = "3.3.23.1"; sha256 = "0bnbiispids7jcgrgcmanf9jqgvk0vaflrvgalz587jwr2zf21k8"; }; + arangodb_3_4 = common { version = "3.4.7"; sha256 = "1wr2xvi5lnl6f2ryyxdwn4wnfiaz0rrf58ja1k19m7b6w3264iim"; }; + arangodb_3_5 = common { version = "3.5.0-rc.7"; sha256 = "1sdmbmyml9d3ia3706bv5901qqmh4sxk7js5b9hyfjqpcib10d1k"; }; } diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix index 88c361e6a91f..f9966b1ccd5b 100644 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ b/pkgs/servers/nosql/cassandra/2.2.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "2.2.13"; - sha256 = "19jryhjkh5jsgp6jlz2v28vwm5dks8i7mshsv3s2fpnl6147paaq"; + version = "2.2.14"; + sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q"; }) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index d5aea241484f..84d4d04cac75 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,14 +8,14 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.16.2.1321-ad17d5f9e"; + version = "1.16.3.1402-22929c8a2"; pname = "plexmediaserver"; name = "${pname}-${version}"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0h3qw563fa296crbcnarykk3lq7qp1v4znzzylbmy87li1rd77a9"; + sha256 = "0mb5y777mcyn8lv1afyi0xx0afyzjm67ccbbkyhk2j817k9diyg5"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 2d9f6b11b27d..f86596150eab 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "9.0.4"; + version = "9.0.5"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "00cyzvk8303y0xcmb0hiy45wj2j6baqqzrfda9f6fv3zlfna1n2g"; + sha256 = "15y5dddvziw9lbl24z4j5yf1ibv79bn052lmx08rbxh78777csw3"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix index 3c21a2a77efb..48f5847b1117 100644 --- a/pkgs/servers/search/solr/8.x.nix +++ b/pkgs/servers/search/solr/8.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.1.1"; + version = "8.2.0"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "18a6pgbvg6z38r3kqkhr152z7sa2hqip2g9fd26y4gzm2665j5dm"; + sha256 = "0j9lydxlng785h2n1b8avinrkqdpbj5qn4rk897p2pbf4fdv795z"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://lucene.apache.org/solr/; + homepage = "https://lucene.apache.org/solr/"; description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 6a32ce39d5ca..ddd46299a9cb 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "7.7.1"; + version = "7.7.2"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "1i189xhlxrpdqx2gx3r8s4dcd7nm74vjynwkrgv2hnq4mw95zf2g"; + sha256 = "1pr02d4sw5arig1brjb6j7ir644n8s737qsx6ll46di5iw1y93pb"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://lucene.apache.org/solr/; + homepage = "https://lucene.apache.org/solr/"; description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index cb5d79bdfcce..639fa322525b 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.3.2"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1i28d6ml07f5f9ik831jagicjk84xdla62hs88bkwajbykzjmqrk"; + sha256 = "14f09sj2rxmixd5yjmwp82j49rxn1fvcxkvh7qjif893xgk98a3w"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index c37eaad2f7fb..a55d1cf14cda 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,6 +1,6 @@ let -# the default list from v1.8.5, except with applications/mod_signalwire also disabled +# the default list from v1.8.7, except with applications/mod_signalwire also disabled defaultModules = mods: with mods; [ applications.commands applications.conference @@ -86,11 +86,11 @@ modulesConf = let in stdenv.mkDerivation rec { - name = "freeswitch-1.8.5"; + name = "freeswitch-1.8.7"; src = fetchurl { url = "https://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; - sha256 = "00xdrx84pw2v5pw1r5gfbb77nmvlfj275pmd48yfrc9g8c91j1sr"; + sha256 = "0k52mxdfc5w9fdnz8kvfjiwnnjjhnpkirnyrfkhq7bad84m731z4"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 249a5af5d480..6636c099e832 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bison +{ stdenv, fetchurl, cmake, bison, pkgconfig , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds }: @@ -6,12 +6,12 @@ let self = stdenv.mkDerivation rec { - name = "mysql-${version}"; - version = "5.7.25"; + pname = "mysql"; + version = "5.7.27"; src = fetchurl { - url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "0gvjcdnba7nf2dx3fbqk1qyg49zclfvaihb78l8h6qc08di1qxak"; + url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; + sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' @@ -19,13 +19,11 @@ self = stdenv.mkDerivation rec { export PATH=$PATH:$TMPDIR ''; - nativeBuildInputs = [ cmake bison ]; + nativeBuildInputs = [ cmake bison pkgconfig ]; buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; - enableParallelBuilding = true; - outputs = [ "out" "static" ]; cmakeFlags = [ @@ -76,7 +74,7 @@ self = stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.mysql.com/; + homepage = "https://www.mysql.com/"; description = "The world's most popular open source database"; platforms = platforms.unix; license = with licenses; [ diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 3fedf3fa8048..3db62aa491ce 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }: stdenv.mkDerivation rec { - name = "pgpool-II-3.4.14"; + pname = "pgpool-II"; + version = "4.0.5"; + name = "${pname}-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; - sha256 = "1paak83f4lv48xckmf2znryrvhmdz86w4v97mcw2gxm50hcl74sw"; + sha256 = "0v2g2ksikn10kxsa8i47gv0kbklrsscvlddza3caf522q1k0fic4"; }; - patches = [ ./pgpool-II-3.4.14-glibc-2.26.patch ]; + patches = [ ./pgpool.patch ]; buildInputs = [ postgresql openssl pam libmemcached ]; diff --git a/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch b/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch deleted file mode 100644 index 6efffff0c6d9..000000000000 --- a/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/watchdog/wd_lifecheck.c b/src/watchdog/wd_lifecheck.c -index 1e72307..5cf68a3 100644 ---- a/src/watchdog/wd_lifecheck.c -+++ b/src/watchdog/wd_lifecheck.c -@@ -26,6 +26,7 @@ - #include <ctype.h> - #include <time.h> - #include <string.h> -+#include <stdint.h> - #include <stdlib.h> - #include <unistd.h> - #include <netdb.h> diff --git a/pkgs/servers/sql/pgpool/pgpool.patch b/pkgs/servers/sql/pgpool/pgpool.patch new file mode 100644 index 000000000000..7c9d92a88bf7 --- /dev/null +++ b/pkgs/servers/sql/pgpool/pgpool.patch @@ -0,0 +1,23 @@ +diff --git a/src/main/main.c b/src/main/main.c +index eec3c3e4..4169112b 100644 +--- a/src/main/main.c ++++ b/src/main/main.c +@@ -337,10 +337,14 @@ main(int argc, char **argv) + char dirnamebuf[POOLMAXPATHLEN + 1]; + char *dirp; + +- strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf)); +- dirp = dirname(dirnamebuf); +- snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s", +- dirp, pool_config->pool_passwd); ++ if (pool_config->pool_passwd[0] != '/') { ++ strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf)); ++ dirp = dirname(dirnamebuf); ++ snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s", ++ dirp, pool_config->pool_passwd); ++ } else ++ strlcpy(pool_passwd, pool_config->pool_passwd, ++ sizeof(pool_passwd)); + pool_init_pool_passwd(pool_passwd, POOL_PASSWD_R); + } + diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ba4fd8e3d38a..711ad35bcc1b 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -168,41 +168,41 @@ let in self: { postgresql_9_4 = self.callPackage generic { - version = "9.4.23"; + version = "9.4.24"; psqlSchema = "9.4"; - sha256 = "16qx4gfq7i2nnxm0i3zxpb3z1mmzx05a3fsh95414ay8n049q00d"; + sha256 = "0acl1wmah3r1a0qjjmpc256glccrjnzq4pkwklx4d9s6vmkks9aj"; this = self.postgresql_9_4; inherit |