diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-29 15:54:33 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-29 15:54:33 -0700 |
commit | 271972de0a7f0027f33d2bf3098070f1a73bbc55 (patch) | |
tree | c37c532df1e46c3ad5e5a51f713cb35fdd374373 /pkgs/servers | |
parent | 48a791d27062c71ced0921920d95fdd991b35107 (diff) | |
parent | ea4850ca6438d62012d2f3caec1c52c1653192b0 (diff) | |
download | nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.gz nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.bz2 nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.lz nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.xz nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.tar.zst nixlib-271972de0a7f0027f33d2bf3098070f1a73bbc55.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/http/nginx/default.nix | 14 | ||||
-rw-r--r-- | pkgs/servers/memcached/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/meteor/default.nix | 93 | ||||
-rw-r--r-- | pkgs/servers/meteor/main.patch | 49 | ||||
-rw-r--r-- | pkgs/servers/misc/taskserver/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/neard/default.nix | 27 | ||||
-rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/s6/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/unifi/default.nix | 4 |
9 files changed, 192 insertions, 14 deletions
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 7888a772e2a5..54f4e1599b8c 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat , gd, geoip, luajit +, curl, apr, aprutil, apacheHttpd, yajl, libcap, modsecurity_standalone , rtmp ? false , fullWebDAV ? false , syslog ? false , moreheaders ? false , echo ? false -, ngx_lua ? false +, modsecurity ? false +, ngx_lua ? modsecurity || false , set_misc ? false , fluent ? false , extraModules ? [] @@ -48,6 +50,8 @@ let sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn"; }; + modsecurity-ext = modsecurity_standalone.nginx; + echo-ext = fetchFromGitHub { owner = "openresty"; repo = "echo-nginx-module"; @@ -93,7 +97,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ] ++ optional fullWebDAV expat - ++ optional ngx_lua luajit; + ++ optional ngx_lua luajit + ++ optionals modsecurity [ curl apr aprutil apacheHttpd yajl ]; LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else ""; LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else ""; @@ -132,14 +137,17 @@ stdenv.mkDerivation rec { ++ optional echo "--add-module=${echo-ext}" ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" ++ optional set_misc "--add-module=${set-misc-ext}" - ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) + ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) [ "--with-file-aio" "--with-aio_module" ] ++ optional fluent "--add-module=${fluentd}" + ++ optional modsecurity "--add-module=${modsecurity-ext}/nginx/modsecurity" ++ (map (m: "--add-module=${m}") extraModules); additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized"; + NIX_CFLAGS_COMPILE = optionalString modsecurity "-I${aprutil}/include/apr-1 -I${apacheHttpd}/include -I${apr}/include/apr-1 -I${yajl}/include"; + preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" ''; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 294cb003ab43..9d110d9c1461 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = http://memcached.org/; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } - diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix new file mode 100644 index 000000000000..5e13b4520c9b --- /dev/null +++ b/pkgs/servers/meteor/default.nix @@ -0,0 +1,93 @@ +{ stdenv, lib, fetchurl, zlib, patchelf }: + +let + bootstrap = fetchurl { + url = "https://d3sqy0vbqsdhku.cloudfront.net/packages-bootstrap/1.2.0.1/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "0jc516qyig7f5a8ns4y6d9031f0ww2sd90n837kz6x97nin7655s"; + }; +in + +stdenv.mkDerivation rec { + name = "meteor-${version}"; + version = "1.2.0.1"; + + dontStrip = true; + + unpackPhase = '' + tar xf ${bootstrap} + sourceRoot=.meteor + ''; + + installPhase = '' + mkdir $out + + cp -r packages $out + chmod -R +w $out/packages + + cp -r package-metadata $out + chmod -R +w $out/package-metadata + + devBundle=$(find $out/packages/meteor-tool -name dev_bundle) + ln -s $devBundle $out/dev_bundle + + toolsDir=$(dirname $(find $out/packages -print | grep "meteor-tool/.*/tools/index.js$")) + ln -s $toolsDir $out/tools + + # Patch Meteor to dynamically fixup shebangs and ELF metadata where + # necessary. + pushd $out + patch -p1 < ${./main.patch} + popd + substituteInPlace $out/tools/cli/main.js \ + --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib}/lib" \ + --replace "@PATCHELF@" "${patchelf}/bin/patchelf" + + # Patch node. + node=$devBundle/bin/node + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $node):${stdenv.cc.cc}/lib" \ + $node + + # Patch mongo. + for p in $devBundle/mongodb/bin/mongo{,d}; do + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib}/lib" \ + $p + done + + # Patch node dlls. + for p in $(find $out/packages -name '*.node'); do + patchelf \ + --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib" \ + $p + done + + # Meteor needs an initial package-metadata in $HOME/.meteor, + # otherwise it fails spectacularly. + mkdir -p $out/bin + cat << EOF > $out/bin/meteor + #!${stdenv.shell} + + if [[ ! -f \$HOME/.meteor/package-metadata/v2.0.1/packages.data.db ]]; then + mkdir -p \$HOME/.meteor/package-metadata/v2.0.1 + cp $out/package-metadata/v2.0.1/packages.data.db "\$HOME/.meteor/package-metadata/v2.0.1" + chown "\$(whoami)" "\$HOME/.meteor/package-metadata/v2.0.1/packages.data.db" + chmod +w "\$HOME/.meteor/package-metadata/v2.0.1/packages.data.db" + fi + + $node \''${TOOL_NODE_FLAGS} $out/tools/index.js "\$@" + EOF + chmod +x $out/bin/meteor + ''; + + meta = with lib; { + description = "Complete open source platform for building web and mobile apps in pure JavaScript"; + homepage = "http://www.meteor.com"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/servers/meteor/main.patch b/pkgs/servers/meteor/main.patch new file mode 100644 index 000000000000..b5834bf62922 --- /dev/null +++ b/pkgs/servers/meteor/main.patch @@ -0,0 +1,49 @@ +diff --git a/tools/cli/main.js b/tools/cli/main.js +index 84f94bc..4fbda17 100644 +--- a/tools/cli/main.js ++++ b/tools/cli/main.js +@@ -484,6 +484,44 @@ var springboard = function (rel, options) { + process.exit(ret.wait()); + } + ++ // BEGIN HACK ++ // patch shebang: ++ var fs = require('fs'); ++ var path = require("path") ++ var srcOld = fs.readFileSync(executable, 'utf8'); ++ srcNew = srcOld.replace(/^#!\/bin\/bash/, '#!/bin/sh'); ++ if (srcOld !== srcNew) { ++ fs.writeFileSync(executable, srcNew, 'utf8'); ++ } ++ // patch elfs: ++ var dir = path.dirname(executable); ++ var interpreter = "@INTERPRETER@"; ++ var rpath = "@RPATH@"; ++ function spawnSync(/*...*/) { ++ var args = Array.prototype.slice.call(arguments); ++ var proc = require("child_process").spawn.apply(null, args); ++ var future = new Future(); ++ proc.on('close', function (code) { ++ future.return(); ++ }); ++ return future.wait(); ++ } ++ function patchelf(/*...*/) { ++ var pathParts = Array.prototype.slice.call(arguments); ++ var p = path.join.apply(null, [dir, "dev_bundle"].concat(pathParts)); ++ spawnSync('@PATCHELF@', [ ++ "--set-interpreter", ++ interpreter, ++ "--set-rpath", ++ rpath, ++ p ++ ], {stdio: 'inherit'}); ++ } ++ patchelf("bin", "node"); ++ patchelf("mongodb", "bin", "mongo"); ++ patchelf("mongodb", "bin", "mongod"); ++ // END HACK ++ + // Now exec; we're not coming back. + require('kexec')(executable, newArgv); + throw Error('exec failed?'); diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 0fdcf5f2f3b5..3d34bb8e11f2 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "taskserver-${version}"; - version = "1.0.0"; + version = "1.1.0"; enableParallelBuilding = true; src = fetchurl { url = "http://www.taskwarrior.org/download/taskd-${version}.tar.gz"; - sha256 = "162ef1eec48f8145870ef0dbe0121b78a6da99815bc18af77de07fbb0abe02d0"; + sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v"; }; nativeBuildInputs = [ cmake libuuid gnutls ]; @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://taskwarrior.org; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix new file mode 100644 index 000000000000..948da3b02251 --- /dev/null +++ b/pkgs/servers/neard/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, autoreconfHook, pkgconfig, systemd, glib, dbus, libnl }: + +stdenv.mkDerivation rec { + name = "neard-0.15-post-git-20510929"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/network/nfc/neard.git"; + sha256 = "08327b536ad8460a08bdceeec48c561e75ca56e5e0ee034c40d02cd1545906c0"; + }; + + buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl ]; + + configureFlags = [ "--disable-debug" "--enable-tools" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; + + postInstall = '' + install -D -m644 src/neard.service $out/lib/systemd/system/neard.service + install -D -m644 src/main.conf $out/etc/neard/main.conf + ''; + + meta = with stdenv.lib; { + description = "Near Field Communication manager"; + homepage = https://01.org/linux-nfc; + license = licenses.gpl2; + maintainers = with maintainers; [ tstrobel ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 86bcb3e1cec0..d1888e1928a9 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "6.0"; + version = "7.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm"; + sha256 = "1yp8x8z4wigrzik131kjdyhn7hznazvbkbp2zz1vy9l9gqvy26na"; }; patches = [ ./caps-fix.patch ]; @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { [ "--localstatedir=/var" "--sysconfdir=/etc" "--with-access-group=audio" + "--with-bash-completion-dir=\${out}/share/bash-completions/completions" ] ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" @@ -109,7 +110,7 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString libOnly '' rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} - sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-6.0.la + sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la ''; meta = { diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 10d4520d9122..5e29c20339cf 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.3.0"; + version = "2.2.1.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "0dnwkdxqjv5awdgwxci1spcx1s13y5s9wd8ccskwv1rymvpgn8b3"; + sha256 = "1g8gr3znxj8lyqpwrmgzh47yb64zldrvvvgpp1m4pb37k5k11bj9"; }; dontDisableStatic = true; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index b19ccd8db8de..5d0e7455d946 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "4.6.6"; + version = "4.7.5"; src = fetchurl { url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "0c9j5h4dyivfdic1y2q3nvhzajzagskzxyj7009icmy3fzgkv3y5"; + sha256 = "1d5jkpwnz4wvcjr5i73m8i5aah6rkxwd0r9239l90v1ja9lkyk7w"; }; buildInputs = [ unzip ]; |