Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix

5 files changed, 81 insertions, 4 deletions

diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 3e97d11fffb0..6bcddfa72f1b 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    description = "A simple and lightweight volume icon that sits in your system tray.";
+    description = "A simple and lightweight volume icon that sits in your system tray";
     homepage = https://github.com/Unia/gvolicon;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3Plus;
diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
new file mode 100644
index 000000000000..30b608c5ba4d
--- /dev/null
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, which, pkgconfig
+, ocaml, ocamlPackages
+, libao, portaudio, alsaLib, pulseaudio, jack2
+, libsamplerate, libmad, taglib, lame, libogg
+, libvorbis, speex, libtheora, libopus, fdk_aac
+, faad2, flac, ladspaH, ffmpeg, frei0r, dssi
+, }:
+
+let
+  version = "1.1.1";
+
+  packageFilters = map (p: "-e '/ocaml-${p}/d'" )
+    [ "gstreamer" "shine" "aacplus" "schroedinger"
+      "voaacenc" "soundtouch" "gavl" "lo"
+    ];
+in
+stdenv.mkDerivation {
+  name = "liquidsoap-full-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/savonet/liquidsoap/${version}/liquidsoap-${version}-full.tar.gz";
+    sha256 = "1w1grgja5yibph90vsxj7ffkpz1sgzmr54jj52s8889dpy609wqa";
+  };
+
+  preConfigure = "sed ${toString packageFilters} PACKAGES.default > PACKAGES";
+  configureFlags = [ "--localstatedir=/var" ];
+
+  buildInputs =
+    [ which ocaml ocamlPackages.findlib pkgconfig
+      libao portaudio alsaLib pulseaudio jack2
+      libsamplerate libmad taglib lame libogg
+      libvorbis speex libtheora libopus fdk_aac
+      faad2 flac ladspaH ffmpeg frei0r dssi
+      ocamlPackages.xmlm ocamlPackages.ocaml_pcre
+      ocamlPackages.camomile
+    ];
+
+  meta = with stdenv.lib; {
+    description = "Swiss-army knife for multimedia streaming";
+    homepage = http://liquidsoap.fm/;
+    maintainers = with maintainers; [ emery ];
+    license = licenses.gpl2;
+    platform = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index 785565fc38d8..f9f33d84437d 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "A cron like daemon for mpd.";
+    description = "A cron like daemon for mpd";
     homepage    = http://alip.github.io/mpdcron/;
     license     = stdenv.lib.licenses.gpl2;
     platforms   = with stdenv.lib.platforms; unix;
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
new file mode 100644
index 000000000000..42a2c9c3a12c
--- /dev/null
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}:
+
+stdenv.mkDerivation rec {
+  name = "pasystray-0.4.0";
+
+  src = fetchurl {
+    url = "https://github.com/christophgysin/pasystray/archive/${name}.zip";
+    sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w";
+  };
+
+  buildInputs = [ unzip autoconf automake makeWrapper pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ];
+
+  preConfigure = ''
+    aclocal
+    autoconf
+    autoheader
+    automake --add-missing
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/bin/pasystray" \
+      --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "PulseAudio system tray";
+    homepage = "https://github.com/christophgysin/pasystray";
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.exlevan ];
+    platfoms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix
index 0de3af28c19e..92091c18df35 100644
--- a/pkgs/tools/audio/volumeicon/default.nix
+++ b/pkgs/tools/audio/volumeicon/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk3 pkgconfig intltool alsaLib ];
 
   meta = with stdenv.lib; {
-    description = "A lightweight volume control that sits in your systray.";
-    homepage = "http://softwarebakery.com/maato/volumeicon.html";
+    description = "A lightweight volume control that sits in your systray";
+    homepage = http://softwarebakery.com/maato/volumeicon.html;
     platforms = pkgs.lib.platforms.linux;
     maintainers = with maintainers; [ bobvanderlinden ];
     license = pkgs.lib.licenses.gpl3;