7 files changed, 105 insertions, 12 deletions
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 48f5bfc71e52..eedc9e9ff93f 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -3,29 +3,32 @@
 , pulseSupport ? true, pulseaudio ? null
 }:
 
+with stdenv.lib;
+
 assert alsaSupport -> alsaLib != null;
 assert pulseSupport -> pulseaudio != null;
 
 stdenv.mkDerivation rec {
-  version = "1.15.1";
+  version = "1.16.0";
   name = "openal-soft-${version}";
 
   src = fetchurl {
     url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
-    sha256 = "0mmhdqiyb3c9dzvxspm8h2v8jibhi8pfjxnf6m0wn744y1ia2a8f";
+    sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g";
   };
 
   buildInputs = [ cmake ]
-    ++ stdenv.lib.optional alsaSupport alsaLib
-    ++ stdenv.lib.optional pulseSupport pulseaudio;
+    ++ optional alsaSupport alsaLib
+    ++ optional pulseSupport pulseaudio;
 
   NIX_LDFLAGS = []
-    ++ stdenv.lib.optional alsaSupport "-lasound"
-    ++ stdenv.lib.optional pulseSupport "-lpulse";
+    ++ optional alsaSupport "-lasound"
+    ++ optional pulseSupport "-lpulse";
 
   meta = {
     description = "OpenAL alternative";
     homepage = http://kcat.strangesoft.net/openal.html;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ftrvxmtrx];
   };
 }
diff --git a/pkgs/servers/dns/mesos-dns/default.nix b/pkgs/servers/dns/mesos-dns/default.nix
new file mode 100644
index 000000000000..5b7d96c14cf8
--- /dev/null
+++ b/pkgs/servers/dns/mesos-dns/default.nix
@@ -0,0 +1,31 @@
+{ lib, goPackages, fetchFromGitHub }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "mesos-dns-${version}";
+  version = "0.1";
+
+  goPackagePath = "github.com/mesosphere/mesos-dns";
+
+  src = fetchFromGitHub {
+    owner = "mesosphere";
+    repo = "mesos-dns";
+    rev = "29940029d4b0c17142373c3280a8b452722b665b";
+    sha256 = "1fycywhdyymibsahjqx9vnigk3pdis3hnmfbxp74pmd9xqqlyv1n";
+  };
+
+  # Avoid including the benchmarking test helper in the output:
+  subPackages = [ "." ];
+
+  buildInputs = with goPackages; [ go dns ];
+  dontInstallSrc = true;
+
+  meta = with lib; {
+    description = "DNS-based service discovery for Mesos clusters";
+    homepage = https://github.com/mesosphere/mesos-dns;
+    license = licenses.apsl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
new file mode 100644
index 000000000000..4fdb475d89b8
--- /dev/null
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, openssl, libuuid }:
+
+stdenv.mkDerivation rec {
+  pname = "mosquitto";
+  version = "1.4";
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = http://mosquitto.org/files/source/mosquitto-1.4.tar.gz;
+    sha256 = "1imw5ps0cqda41b574k8hgz9gdr8yy58f76fg8gw14pdnvf3l7sr";
+  };
+
+  buildInputs = [ openssl libuuid ];
+
+  buildFlags = "mosquitto";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp src/mosquitto $out/bin/
+  '';
+
+  meta = {
+    homepage = http://mosquitto.org/;
+    description = "An open source MQTT v3.1/3.1.1 broker";
+    platforms = stdenv.lib.platforms.unix;
+    # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
+    license = stdenv.lib.licenses.epl10;
+  };
+}
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 739908e3699f..f21b879d5e56 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,14 +1,14 @@
 { fetchurl, stdenv, go }:
 
 let
-  version = "2.4.0";
+  version = "2.6.0";
 in
 stdenv.mkDerivation {
   name = "direnv-${version}";
   src = fetchurl {
     url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz";
     name = "direnv-${version}.tar.gz";
-    sha256 = "aab8028cc1d68461dd1f6c3c9d000eef10273c52399fe5d1dd917f2f4a1a349a";
+    sha256 = "b85aac4d6a4ddf2daf193aabb3b2faf89e56507d33d763ab74cc7eb0b524ac03";
   };
 
   buildInputs = [ go ];
diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix
new file mode 100644
index 000000000000..03c913b72244
--- /dev/null
+++ b/pkgs/tools/misc/makebootfat/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "makebootfat-1.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/advancemame/${name}.tar.gz";
+    sha256 = "0v0g1xax0y6hmw2x10nfhchp9n7vqyvgc33gcxqax8jdq2pxm1q2";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Create bootable USB disks using the FAT filesystem and syslinux";
+    homepage = "http://advancemame.sourceforge.net/boot-readme.html";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.emery ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed6e8a9de3f4..5c1615ee393c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1704,6 +1704,8 @@ let
 
   kzipmix = callPackage_i686 ../tools/compression/kzipmix { };
 
+  makebootfat = callPackage ../tools/misc/makebootfat { };
+
   minidlna = callPackage ../tools/networking/minidlna {
     ffmpeg = ffmpeg_0_10;
   };
@@ -3497,7 +3499,12 @@ let
     releaseType = "update";
     sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
   };
-  gcc-arm-embedded = gcc-arm-embedded-4_8;
+  gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
+    version = "4.9-2014q4-20141203";
+    releaseType = "major";
+    sha256 = "a440bcf68e36b291697567816e756877cd3b5782298e3e3c44eb0812a471980f";
+  };
+  gcc-arm-embedded = gcc-arm-embedded-4_9;
 
   gforth = callPackage ../development/compilers/gforth {};
 
@@ -4340,6 +4347,8 @@ let
     pythonProtobuf = pythonPackages.protobuf;
   };
 
+  mesos-dns = callPackage ../servers/dns/mesos-dns { };
+
   mujs = callPackage ../development/interpreters/mujs { };
 
   nix-exec = callPackage ../development/interpreters/nix-exec {
@@ -6790,6 +6799,8 @@ let
 
   movit = callPackage ../development/libraries/movit { };
 
+  mosquitto = callPackage ../servers/mqtt/mosquitto { };
+
   mps = callPackage ../development/libraries/mps { };
 
   libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index dfff0b680cd4..538506a5c1eb 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -167,14 +167,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   dns = buildGoPackage rec {
-    rev = "fc67c4b981930a377f8a26a5a1f2c0ccd5dd1514";
+    rev = "0bd3fb7026404936cf18204ea527d27f067923cf";
     name = "dns-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/miekg/dns";
     src = fetchFromGitHub {
       inherit rev;
       owner = "miekg";
       repo = "dns";
-      sha256 = "1csjmkx0gl34r4hmkhdbdxb0693f1p10yrjaj8f2jwli9p9sl4mg";
+      sha256 = "1hv2ikpd9gr9idf7zh8nyqgdbnnffs057wsdpd7m44mllbmzhdxn";
     };
   };