diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-02 15:40:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-02 15:40:38 -0500 |
commit | eeb016e8f0d8934dc33db7666d841e4b85713c9a (patch) | |
tree | 4a99561053ba51db60a75389e483784543b105ff /pkgs/servers | |
parent | b4d9113fbf7ad3a09f5caa8f8fc4a9229128f1e5 (diff) | |
parent | 3513034208aac88004e4798020cb66540a77ddad (diff) | |
download | nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.gz nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.bz2 nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.lz nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.xz nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.zst nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.zip |
Merge branch 'staging' into fix-ncurses-darwin-extensions
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/amqp/rabbitmq-server/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/dns/bind/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/net-snmp/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
7 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 3d4a8902c91..4cc187846d0 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,17 +1,11 @@ { stdenv, fetchurl, runCommand , erlang, python, libxml2, libxslt, xmlto , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync - , AppKit, Carbon, Cocoa +, getconf }: -let - # we only need that one glibc binary (28k instead of 2.7M) - getconf = runCommand "getconf" {} '' - install -D ${stdenv.lib.getBin stdenv.cc.libc}/bin/getconf $out/bin/getconf - ''; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; version = "3.6.15"; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 4002c6b3542..1aa487055e2 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { done ''; + doCheck = false; # requires root and the net + meta = { homepage = http://www.isc.org/software/bind; description = "Domain name server"; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 77dcfa43c43..a6b738270a9 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ file perl unzip openssl ]; enableParallelBuilding = true; + doCheck = false; # fails postInstall = '' for f in "$out/lib/"*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a9de5508371..63425fbb28c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -167,11 +167,11 @@ everything = stdenv.mkDerivation (common // { connector-c = stdenv.mkDerivation rec { name = "mariadb-connector-c-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "1g1sq5knarxkfhpkcczr6qxmq12pid65cdkqnhnfs94av89hbswb"; + sha256 = "0vvlfs56hxin130vh8pcs5w7jpv1yc6g76bhpzg88hnp4v1z8frg"; name = "mariadb-connector-c-${version}-src.tar.gz"; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a2093962ea9..5d348c12943 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -75,6 +75,8 @@ let wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin ''; + doInstallCheck = false; # needs a running daemon? + disallowedReferences = [ stdenv.cc ]; passthru = { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 07faa8d3cc7..d15c5924b77 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2468,11 +2468,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.22"; + name = "xkeyboard-config-2.23.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2; - sha256 = "1garmbyfjp0han04l2l90zzwlfbdgdxl6r1qnic36i5wkycckbny"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.23.1.tar.bz2; + sha256 = "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 5efa4bfcfd5..5d4c528bb0b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -582,6 +582,10 @@ in nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex]; }; + xauth = attrs: attrs // { + doCheck = false; # fails + }; + xcursorthemes = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; configureFlags = "--with-cursordir=$(out)/share/icons"; |