diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-23 14:44:21 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-23 14:44:21 -0700 |
| commit | d3f4ba9d6f2b284d8358e6136b4dfdcae4699992 (patch) | |
| tree | 589fd0c2e8625db456ad468f85d2d935d8c3fb97 /pkgs/servers | |
| parent | 3c8b92f4b35618e7c1db33e6878eb9526127406d (diff) | |
| parent | 5cfe893cc48cef16691facbb2bd01826e34afeaf (diff) | |
| download | nixpkgs-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar nixpkgs-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.gz nixpkgs-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.bz2 nixpkgs-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.lz nixpkgs-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.xz nixpkgs-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.tar.zst nixpkgs-d3f4ba9d6f2b284d8358e6136b4dfdcae4699992.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/nginx/unstable.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index e988e8192fc..e71adba3e57 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -5,7 +5,8 @@ , syslog ? false , moreheaders ? false , echo ? false -, ngx_lua ? false }: +, ngx_lua ? false +, withStream ? false }: with stdenv.lib; @@ -61,8 +62,8 @@ let lua-ext = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.12"; - sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4"; + rev = "v0.9.16"; + sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp"; }; in @@ -109,6 +110,7 @@ stdenv.mkDerivation rec { ++ optional moreheaders "--add-module=${moreheaders-ext}" ++ optional echo "--add-module=${echo-ext}" ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" + ++ optional withStream "--with-stream" ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index e018c7790b9..86bcb3e1cec 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook , json_c, libsndfile, libtool -, xlibs, libcap, alsaLib, glib +, xorg, libcap, alsaLib, glib , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat , speexdsp, systemd, webrtc-audio-processing, gconf ? null @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] + ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsaLib udev ] ++ lib.optional airtunesSupport openssl |