diff options
Diffstat (limited to 'pkgs/servers')
30 files changed, 212 insertions, 158 deletions
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 06f8c513063..be9410d3048 100755 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash }: +{ stdenv, fetchurl, jre, makeWrapper, bash, + majorVersion ? "0.9" }: let - kafkaVersion = "0.8.2.1"; - scalaVersion = "2.10"; - + versionMap = { + "0.8" = { kafkaVersion = "0.8.2.1"; + scalaVersion = "2.10"; + sha256 = "1klri23fjxbzv7rmi05vcqqfpy7dzi1spn2084y1dxsi1ypfkvc9"; + }; + "0.9" = { kafkaVersion = "0.9.0.1"; + scalaVersion = "2.11"; + sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; + }; + }; in +with versionMap.${majorVersion}; + stdenv.mkDerivation rec { version = "${scalaVersion}-${kafkaVersion}"; name = "apache-kafka-${version}"; src = fetchurl { url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; - sha256 = "1klri23fjxbzv7rmi05vcqqfpy7dzi1spn2084y1dxsi1ypfkvc9"; + inherit sha256; }; buildInputs = [ jre makeWrapper bash ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 6df27eaf328..5d65e707fd5 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl, - ncurses, mysql, gtk }: +{ stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl +, ncurses, mysql, gtk, lua, hwloc, numactl +}: stdenv.mkDerivation rec { name = "slurm-llnl-${version}"; @@ -10,11 +11,17 @@ stdenv.mkDerivation rec { sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; }; - buildInputs = [ pkgconfig curl python munge perl pam openssl mysql.lib ncurses gtk ]; + outputs = [ "dev" "out" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + curl python munge perl pam openssl mysql.lib ncurses gtk lua hwloc numactl + ]; configureFlags = [ "--with-munge=${munge}" - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" + "--sysconfdir=/etc/slurm" ] ++ stdenv.lib.optional (gtk == null) "--disable-gtktest"; preConfigure = '' @@ -22,6 +29,10 @@ stdenv.mkDerivation rec { substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}" ''; + postInstall = '' + rm -f $out/lib/*.la $out/lib/slurm/*.la + ''; + meta = with stdenv.lib; { homepage = http://www.schedmd.com/; description = "Simple Linux Utility for Resource Management"; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 096bddf62d6..bb0928fa1ee 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-libtool" "--with-libxml2=${libxml2}" - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" "--without-atf" "--without-dlopen" "--without-docbook-xsl" @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/bind9-config $dev moveToOutput bin/isc-config.sh $dev + + for f in $out/lib/*.la; do + sed -i $f -e 's|-L${openssl.dev}|-L${openssl.out}|g' + done ''; meta = { diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 2f416fabe49..851310b4ea3 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchurl, unzip, sqlite }: +{ stdenv, fetchurl, pkgs, ... }: stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.5934"; + version = "3.0.5971"; src = fetchurl { - url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "1yjplz7i0lwxjnmrra33xxsvza6gj4dblsl4rqjq1qv6i0jarfv1"; + url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; + sha256 = "1ahx8y8l7hybkq6wy83cpgnc741q7583lp6h7qnin6x73l2wq2i8"; }; - buildInputs = [ unzip ]; - propagatedBuildInputs = [ sqlite ]; + propagatedBuildInputs = with pkgs; [ + mono + sqlite + ]; - # Need to set sourceRoot as unpacker will complain about multiple directory output - sourceRoot = "."; - - patchPhase = '' - substituteInPlace System.Data.SQLite.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so - substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server" + buildPhase = '' + xbuild /p:Configuration="Release Mono" /p:Platform="Any CPU" /t:build MediaBrowser.Mono.sln + substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/System.Data.SQLite.dll.config --replace libsqlite3.so ${pkgs.sqlite.out}/lib/libsqlite3.so + substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server" ''; installPhase = '' mkdir -p $out/bin - cp -r * $out/bin + cp -r MediaBrowser.Server.Mono/bin/Release\ Mono/* $out/bin/ ''; meta = { diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 84deebcb8f5..5dcaf5a65fe 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook systemd fcgi pkgconfig ]; + # systemd 230 no longer has libsystemd-daemon as a separate entity from libsystemd + postPatch = '' + substituteInPlace configure.ac --replace libsystemd-daemon libsystemd + ''; + meta = with stdenv.lib; { homepage = https://nginx.localdomain.pl/wiki/FcgiWrap; description = "Simple server for running CGI applications over FastCGI"; diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 361aa3d58f7..0bde9baa4bf 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --includedir=$dev/include" ''; configureFlags = '' - --with-z=${zlib} - --with-pcre=${pcre} + --with-z=${zlib.dev} + --with-pcre=${pcre.dev} --enable-mods-shared=all --enable-authn-alias ${if proxySupport then "--enable-proxy" else ""} - ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} + ${if sslSupport then "--enable-ssl --with-ssl=${openssl.dev}" else ""} ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} --with-mpm=${mpm} --enable-cache diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bc7fd1441c1..d52973ea12f 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -46,10 +46,10 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --includedir=$dev/include" ''; configureFlags = '' - --with-apr=${apr} - --with-apr-util=${aprutil} - --with-z=${zlib} - --with-pcre=${pcre} + --with-apr=${apr.dev} + --with-apr-util=${aprutil.dev} + --with-z=${zlib.dev} + --with-pcre=${pcre.dev} --disable-maintainer-mode --disable-debugger-mode --enable-mods-shared=all diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 90d0fb899c3..dee2fb3e4ff 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; - configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}"; + configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; sourceRoot = "${name}-src/native"; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f58479e4478..888efc006d0 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -55,7 +55,7 @@ src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity"; inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil}/include/apr-1 -I${pkgs.apacheHttpd}/include -I${pkgs.apr}/include/apr-1 -I${pkgs.yajl}/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil.dev}/include/apr-1 -I${pkgs.apacheHttpd.dev}/include -I${pkgs.apr.dev}/include/apr-1 -I${pkgs.yajl}/include" ''; }; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 6ecad81973b..89eeeaecb34 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-epoll" "--enable-ipv6" - "--enable-openssl=${openssl}" + "--enable-openssl=${openssl.dev}" "--with-program-prefix=charybdis-" ]; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 512cee4b016..603c765854f 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ openssl zlib ]; configureFlags = - "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}"; + "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl.dev}"; postInstall = "echo postinstall; mkdir -p \${out}/ ; rm -rf \${out}/logs ; ln -s /home/ircd \${out}/logs;"; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 95dc5ab8679..39667c8ba62 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-openldap" "--with-db=${db}" - "--with-sasl=${cyrus_sasl}" + "--with-sasl=${cyrus_sasl.dev}" "--with-netsnmp=${net_snmp}" ]; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 94bc9f2bfe9..46fc9bc00f2 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,33 +1,51 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, bison -, libasr, libevent, zlib, openssl, db, pam, cacert +{ stdenv, lib, fetchurl, autoconf, automake, libtool, bison +, libasr, libevent, zlib, openssl, db, pam + +# opensmtpd requires root for no reason to encrypt passwords, this patch fixes it +# see also https://github.com/OpenSMTPD/OpenSMTPD/issues/678 +, unpriviledged_smtpctl_encrypt ? true + +# This enables you to override the '+' character which typically separates the user from the tag in user+tag@domain.tld +, tag_char ? null }: stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.7.3p2"; + version = "5.9.2p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "0d2973008d0f66bebb84bed516be6c32617735241cc54dd26643529281a8e52b"; + sha256 = "07d7f1m5sxyz6mkk228rcm7fsf7350994ayvmhgph333q5rz48im"; }; patches = [ ./proc_path.diff ]; + postPatch = with builtins; with lib; + optionalString (isString tag_char) '' + sed -i -e "s,TAG_CHAR.*'+',TAG_CHAR '${tag_char}'," smtpd/smtpd-defines.h + '' + + optionalString unpriviledged_smtpctl_encrypt '' + substituteInPlace smtpd/smtpctl.c --replace \ + 'if (geteuid())' \ + 'if (geteuid() != 0 && !(argc > 1 && !strcmp(argv[1], "encrypt")))' + ''; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-mantype=doc" - "--with-pam" - "--without-bsd-auth" - "--with-sock-dir=/run" - "--with-privsep-user=smtpd" - "--with-queue-user=smtpq" - "--with-ca-file=/etc/ssl/certs/ca-certificates.crt" - "--with-libevent-dir=${libevent.dev}" - "--enable-table-db" + "--with-auth-pam" + "--without-auth-bsdauth" + "--with-path-socket=/run" + "--with-user-smtpd=smtpd" + "--with-user-queue=smtpq" + "--with-group-queue=smtpq" + "--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt" + "--with-libevent=${libevent.dev}" + "--with-table-db" ]; installFlags = [ @@ -35,14 +53,14 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = { + meta = with stdenv.lib; { homepage = https://www.opensmtpd.org/; description = '' A free implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions ''; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ rickynils obadz ]; }; } diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 0123d19bf3f..cf93b11ba9a 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-privsep-user=smtpd" - "--with-libevent-dir=${libevent}" + "--with-libevent-dir=${libevent.dev}" "--with-filter-clamav" "--with-filter-dkim-signer" diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/servers/mail/opensmtpd/proc_path.diff index 0e8eac0bb83..9306685e365 100644 --- a/pkgs/servers/mail/opensmtpd/proc_path.diff +++ b/pkgs/servers/mail/opensmtpd/proc_path.diff @@ -1,11 +1,12 @@ -diff -Naur opensmtpd-5.7.1p1/smtpd/parse.y opensmtpd-5.7.1p1.patched/smtpd/parse.y ---- opensmtpd-5.7.1p1/smtpd/parse.y 2015-06-30 10:13:34.000000000 +0200 -+++ opensmtpd-5.7.1p1.patched/smtpd/parse.y 2015-09-26 08:41:17.012472516 +0200 -@@ -2519,13 +2519,19 @@ +diff --git a/smtpd/parse.y b/smtpd/parse.y +index ab02719..c1c77d9 100644 +--- a/smtpd/parse.y ++++ b/smtpd/parse.y +@@ -2534,13 +2534,19 @@ create_filter_proc(char *name, char *prog) { struct filter_conf *f; char *path; -+ const char *proc_path; ++ const char *proc_path; if (dict_get(&conf->sc_filters, name)) { yyerror("filter \"%s\" already defined", name); @@ -13,64 +14,71 @@ diff -Naur opensmtpd-5.7.1p1/smtpd/parse.y opensmtpd-5.7.1p1.patched/smtpd/parse } - if (asprintf(&path, "%s/filter-%s", PATH_LIBEXEC, prog) == -1) { -+ proc_path = getenv("OPENSMTPD_PROC_PATH"); -+ if (proc_path == NULL) { -+ proc_path = PATH_LIBEXEC; -+ } ++ proc_path = getenv("OPENSMTPD_PROC_PATH"); ++ if (proc_path == NULL) { ++ proc_path = PATH_LIBEXEC; ++ } + + if (asprintf(&path, "%s/filter-%s", proc_path, prog) == -1) { yyerror("filter \"%s\" asprintf failed", name); return (0); } -diff -Naur opensmtpd-5.7.1p1/smtpd/smtpd.c opensmtpd-5.7.1p1.patched/smtpd/smtpd.c ---- opensmtpd-5.7.1p1/smtpd/smtpd.c 2015-06-30 10:13:34.000000000 +0200 -+++ opensmtpd-5.7.1p1.patched/smtpd/smtpd.c 2015-09-26 08:41:16.998472557 +0200 -@@ -854,6 +854,7 @@ +diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c +index afc8891..9b0a80f 100644 +--- a/smtpd/smtpd.c ++++ b/smtpd/smtpd.c +@@ -795,6 +795,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) char path[PATH_MAX]; char name[PATH_MAX]; char *arg; -+ char *proc_path; ++ char *proc_path; if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) { log_warnx("warn: %s-proc: conf too long", key); -@@ -864,7 +865,12 @@ +@@ -805,7 +806,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname) if (arg) *arg++ = '\0'; - if (snprintf(path, sizeof(path), PATH_LIBEXEC "/%s-%s", key, name) >= -+ proc_path = getenv("OPENSMTPD_PROC_PATH"); -+ if (proc_path == NULL) { -+ proc_path = PATH_LIBEXEC; -+ } ++ proc_path = getenv("OPENSMTPD_PROC_PATH"); ++ if (proc_path == NULL) { ++ proc_path = PATH_LIBEXEC; ++ } + + if (snprintf(path, sizeof(path), "%s/%s-%s", proc_path, key, name) >= (ssize_t)sizeof(path)) { log_warn("warn: %s-proc: exec path too long", key); return (-1); -diff -Naur opensmtpd-5.7.1p1/smtpd/table.c opensmtpd-5.7.1p1.patched/smtpd/table.c ---- opensmtpd-5.7.1p1/smtpd/table.c 2015-06-30 10:13:34.000000000 +0200 -+++ opensmtpd-5.7.1p1.patched/smtpd/table.c 2015-09-26 08:41:17.005472536 +0200 -@@ -201,6 +201,7 @@ +diff --git a/smtpd/table.c b/smtpd/table.c +index 21ee237..95b5164 100644 +--- a/smtpd/table.c ++++ b/smtpd/table.c +@@ -193,6 +193,7 @@ table_create(const char *backend, const char *name, const char *tag, struct table_backend *tb; char buf[LINE_MAX]; char path[LINE_MAX]; -+ const char *proc_path; ++ const char *proc_path; size_t n; struct stat sb; -@@ -215,8 +216,14 @@ +@@ -207,11 +208,16 @@ table_create(const char *backend, const char *name, const char *tag, if (name && table_find(name, NULL)) fatalx("table_create: table \"%s\" already defined", name); -+ proc_path = getenv("OPENSMTPD_PROC_PATH"); -+ if (proc_path == NULL) { -+ proc_path = PATH_LIBEXEC; -+ } ++ proc_path = getenv("OPENSMTPD_PROC_PATH"); ++ if (proc_path == NULL) { ++ proc_path = PATH_LIBEXEC; ++ } + if ((tb = table_backend_lookup(backend)) == NULL) { -- if ((size_t)snprintf(path, sizeof(path), PATH_LIBEXEC "/table-%s", +- if ((size_t)snprintf(path, sizeof(path), PATH_LIBEXEC"/table-%s", +- backend) >= sizeof(path)) { +- fatalx("table_create: path too long \"" +- PATH_LIBEXEC"/table-%s\"", backend); + if ((size_t)snprintf(path, sizeof(path), "%s/table-%s", -+ proc_path, - backend) >= sizeof(path)) { - fatalx("table_create: path too long \"" - PATH_LIBEXEC "/table-%s\"", backend); ++ proc_path, backend) >= sizeof(path)) { ++ fatalx("table_create: path too long \"%s/table-%s\"", ++ proc_path, backend); + } + if (stat(path, &sb) == 0) { + tb = table_backend_lookup("proc"); diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 70f83479160..392b1014656 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -7,7 +7,7 @@ let ccargs = lib.concatStringsSep " " ([ - "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl}/include/sasl" + "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysql}/include/mysql" ] diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 816ac1bdb25..6da7d8cf85b 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-sys-contact=root@unknown" "--with-logfile=/var/log/net-snmpd.log" "--with-persistent-directory=/var/lib/net-snmp" - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; buildInputs = [ autoreconfHook file perl unzip openssl ]; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 139786ba59d..2ebc8026484 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -46,8 +46,8 @@ in ] ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}" ++ stdenv.lib.optional enableSnmp "--with-net-snmp" - ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2}" - ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap}"; + ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2.dev}" + ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap.dev}"; postPatch = '' sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 12ed3f56d9f..777ad9407c7 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -51,7 +51,7 @@ buildPerlPackage { preConfigure = '' substituteInPlace core/server/Makefile.PL \ - --replace "my \$openssl_inc_dir = ''';" "my \$openssl_inc_dir = '${openssl}/include';" \ + --replace "my \$openssl_inc_dir = ''';" "my \$openssl_inc_dir = '${openssl.dev}/include';" \ --replace "my \$openssl_lib_dir = ''';" "my \$openssl_lib_dir = '${openssl.out}/lib';" \ --replace "my \$openssl_binary = ''';" "my \$openssl_binary = '${openssl.bin}/bin/openssl';" substituteInPlace tools/vergen --replace "#!/usr/bin/perl" "#!${perl}/bin/perl" diff --git a/pkgs/servers/rippled/ripple-rest.nix b/pkgs/servers/rippled/ripple-rest.nix index 01fd098c920..3449645f185 100644 --- a/pkgs/servers/rippled/ripple-rest.nix +++ b/pkgs/servers/rippled/ripple-rest.nix @@ -22,5 +22,6 @@ in nodePackages.buildNodePackage rec { homepage = https://github.com/ripple/ripple-rest; maintainers = with maintainers; [ offline ]; license = [ licenses.mit ]; + broken = true; }; } diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c8f25b6f09d..902be532222 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,6 +2,7 @@ , openssl, pcre, boost, judy, bison, libxml2 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices +, makeWrapper }: with stdenv.lib; @@ -19,6 +20,7 @@ stdenv.mkDerivation rec { # temporary due to https://mariadb.atlassian.net/browse/MDEV-9000 (if stdenv.is64bit then snappy else null) pcre libxml2 boost judy bison libevent cracklib + makeWrapper ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd ] ++ stdenv.lib.optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; @@ -92,6 +94,10 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/mysql_install_db \ --replace basedir=\"\" basedir=\"$out\" + # Wrap mysqld with --basedir, but as last flag + wrapProgram $out/bin/mysqld + sed -i "s,\(^exec.*$\),\1 --basedir=$out,g" $out/bin/mysqld + # Remove superfluous files rm -r $out/mysql-test $out/sql-bench $out/data # Don't need testing data rm $out/share/man/man1/mysql-test-run.pl.1 diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index caf6149e62c..017c99b01d0 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-thread-safe-client" - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" "--with-embedded-server" "--with-plugins=max-no-ndb" "--with-unix-socket-path=/run/mysqld/mysqld.sock" diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 163deda7ae0..a714585c289 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.48"; + version = "5.5.49"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "10fpzvf6hxvqgaq8paiz8fvhcbbs4qnzqw0svq40bvlyhx2qfgyc"; + sha256 = "07wy1qbxf3fxgi04v6cqs4ymi9hgsgabk218bxiwlsx706ds976d"; }; patches = if stdenv.isCygwin then [ diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 4de0ace0c03..aba8efa0798 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " - --enable-shared --disable-all-vads --with-readline=${readline} + --enable-shared --disable-all-vads --with-readline=${readline.dev} --disable-hslookup --disable-wbxml2 --without-iodbc - --enable-openssl=${openssl} + --enable-openssl=${openssl.dev} "; postInstall='' diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index afb91602d76..7a8db3f2962 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " - --enable-shared --disable-all-vads --with-readline=${readline} + --enable-shared --disable-all-vads --with-readline=${readline.dev} --disable-hslookup --disable-wbxml2 --without-iodbc - --enable-openssl=${openssl} + --enable-openssl=${openssl.dev} "; postInstall='' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 45c01d74cdb..16fa2423a11 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -601,11 +601,11 @@ let }) // {inherit xproto ;}; inputproto = (mkDerivation "inputproto" { - name = "inputproto-2.3.1"; + name = "inputproto-2.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2; - sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss"; + url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2; + sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; @@ -806,6 +806,7 @@ let sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; + meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXft = (mkDerivation "libXft" { @@ -1040,11 +1041,11 @@ let }) // {inherit ;}; libxcb = (mkDerivation "libxcb" { - name = "libxcb-1.11.1"; + name = "libxcb-1.12"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2; - sha256 = "0c4xyvdyx5adh8dzyhnrmvwwz24gri4z1czxmxqm63i0gmngs85p"; + url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2; + sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1260,11 +1261,11 @@ let }) // {inherit ;}; videoproto = (mkDerivation "videoproto" { - name = "videoproto-2.3.2"; + name = "videoproto-2.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2; - sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld"; + url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2; + sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1326,11 +1327,11 @@ let }) // {inherit ;}; xcbproto = (mkDerivation "xcbproto" { - name = "xcb-proto-1.11"; + name = "xcb-proto-1.12"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2; - sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l"; + url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2; + sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr"; }; buildInputs = [pkgconfig python ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1348,11 +1349,11 @@ let }) // {inherit gperf m4 libxcb xproto ;}; xcbutilcursor = (mkDerivation "xcbutilcursor" { - name = "xcb-util-cursor-0.1.2"; + name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2; - sha256 = "0fpv46zb7kz04qxwvpax4cpd2kd8yhsm2n0if1isniqdh5xkcrgd"; + url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; + sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1579,11 +1580,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.10.1"; + name = "xf86-input-evdev-2.10.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2; - sha256 = "05z05n39v8s2b0hwhcjb1bca7j8gc62bv9jxnibawwmjym3jp75g"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2; + sha256 = "07gybpiv33rymcq5l729agan7nzv5f97wdczja6p145b846n6fm7"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1612,11 +1613,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.16.0"; + name = "xf86-input-libinput-0.19.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2; - sha256 = "0jbgnxsbr3g4g9vkspcc6pqy7av59zx5bb78vkvaqy8yx4qybbgx"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2; + sha256 = "0xzl3aiah9vma3pvi170g1847vxqrg4is3ilc51f72lbgkf30pbc"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1700,11 +1701,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.6.1"; + name = "xf86-video-ati-7.7.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.6.1.tar.bz2; - sha256 = "0k6kw69mcarlmxlb4jlhz887jxqr94qx2pin04xcv2ysp3pdj5i5"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2; + sha256 = "1hy1n8an98mflfbdcb3q7wv59x971j7nf9zhivf90p0lgdbiqkc4"; }; buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1810,11 +1811,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2015-11-14"; + name = "xf86-video-intel-2016-05-22"; builder = ./builder.sh; src = fetchurl { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/0340718366d7cb168a46930eb7be22f2d88354d8.tar.gz; - sha256 = "0x11dig1wmpjz5n35sh30zs58ar8q8836w3zrkwkvgxj6q6smvvr"; + url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/8477615ae1bd284aca1221185ffefe0630d3f7ab.tar.gz; + sha256 = "1fnwcsg2kr32nv9x6z671g6amwcyhba2392d63kjl2avjyhjad79"; }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1842,17 +1843,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - xf86videomodesetting = (mkDerivation "xf86videomodesetting" { - name = "xf86-video-modesetting-0.9.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2; - sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"; - }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ]; - meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;}; - xf86videoneomagic = (mkDerivation "xf86videoneomagic" { name = "xf86-video-neomagic-1.2.9"; builder = ./builder.sh; @@ -1938,6 +1928,7 @@ let sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videos3virge = (mkDerivation "xf86videos3virge" { @@ -2238,11 +2229,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.16"; + name = "xkeyboard-config-2.17"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.16.tar.bz2; - sha256 = "0n0xinsljc5mww1qw7dfp8knv0f1r9hs6pdhl0fggdwn5hhiz2hy"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2; + sha256 = "00878f1v3034ki78pjpf2db0bh7jsmszsnxr3bf5qxripm2bxiny"; }; buildInputs = [pkgconfig libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2407,22 +2398,22 @@ let }) // {inherit libX11 xproto ;}; xproto = (mkDerivation "xproto" { - name = "xproto-7.0.28"; + name = "xproto-7.0.29"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xproto-7.0.28.tar.bz2; - sha256 = "1jpnvm33vi2dar5y5zgz7jjh0m8fpkcxm0f0lbwfx37ns5l5bs19"; + url = mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2; + sha256 = "12lzpa9mrzkyrhrphzpi1014np3328qg7mdq08wj6wyaj9q4f6kc"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; xrandr = (mkDerivation "xrandr" { - name = "xrandr-1.4.3"; + name = "xrandr-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2; - sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i"; + url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; + sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index fc3068b8f35..56a7b1f76a9 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,8 +1,8 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6c0bb80b755..8f18613d06e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -305,6 +305,7 @@ in }; xf86inputsynaptics = attrs: attrs // { + outputs = [ "dev" "out" ]; # *.pc pulls xorgserver.dev buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index d0a812e45d6..2ebf31918b8 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -48,7 +48,7 @@ mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 -mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2 +mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2 mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 @@ -101,7 +101,7 @@ mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/twm-1.0.9.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2 -mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2 +mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.9.tar.bz2 @@ -119,17 +119,17 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.6.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 @@ -144,7 +144,6 @@ mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 @@ -176,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.16.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 @@ -188,8 +187,8 @@ mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.28.tar.bz2 -mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2 +mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2 +mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xset-1.2.3.tar.bz2 diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 974a636e559..ef7d64b3e78 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { (lib.enableFeature withIconv "iconv") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") - ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}"; + ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}"; enableParallelBuilding = true; |