Merge branch 'master.upstream' into staging.upstream

3 files changed, 40 insertions, 12 deletions

diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
new file mode 100644
index 000000000000..80791756e659
--- /dev/null
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "antimicro-${version}";
+  version = "2.18";
+
+  src = fetchzip {
+    url    = "https://github.com/Ryochan7/antimicro/archive/${version}.tar.gz";
+    sha256 = "0kyl4xl2am50v2xscgy2irpcdj78f7flgfhljyjck4ynf8d40vb7";
+  };
+
+  buildInputs = [
+    cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst
+  ];
+
+  meta = with stdenv.lib; {
+    description = "GUI for mapping keyboard and mouse controls to a gamepad";
+    homepage = "https://github.com/Ryochan7/antimicro";
+    maintainers = with maintainers; [ jb55 ];
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix
index a20b1d577754..44fa1cb7cfb1 100644
--- a/pkgs/tools/misc/logstash-forwarder/default.nix
+++ b/pkgs/tools/misc/logstash-forwarder/default.nix
@@ -1,15 +1,21 @@
-{ stdenv, fetchgit, go_1_3 }:
-stdenv.mkDerivation {
-  name = "logstash-forwarder-20141216";
-  src = fetchgit {
-    url = https://github.com/elasticsearch/logstash-forwarder.git;
-    rev = "6082bd8aaecb2180f5b56f4fb1b2940a6935ef7b";
-    sha256 = "1686rlx5p7d2806cg8y4376m4l7nvg1yjgg52ccrs0v4fnqs6292";
+{ stdenv, fetchFromGitHub, go }:
+
+stdenv.mkDerivation rec {
+  name = "logstash-forwarder-${version}";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "elasticsearch";
+    repo = "logstash-forwarder";
+    rev = "v${version}";
+    sha256 = "05g7366w8f7h75n1ia7njdpmparr6sfvn45xxfh5412zigqidz6l";
   };
-  buildInputs = [ go_1_3 ];
+
+  buildInputs = [ go ];
+
   installPhase = ''
     mkdir -p $out/bin
-    cp build/bin/logstash-forwarder $out/bin
+    find . -name logstash-forwarder -type f -exec cp {} $out/bin \;
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index eb3375730188..de9d918deeb4 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -10,17 +10,17 @@
 
 buildPythonPackage rec {
   name = "youtube-dl-${version}";
-  version = "2015.05.29";
+  version = "2015.08.16.1";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
+    sha256 = "04g78anvy519pj8m8ys1ifmnmp1x3i9bw3afwqjch71n9f77papy";
   };
 
   buildInputs = [ makeWrapper zip pandoc ];
 
   # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
-  postInstall = stdenv.lib.optionalString (ffmpeg != null) 
+  postInstall = stdenv.lib.optionalString (ffmpeg != null)
     ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
   meta = with stdenv.lib; {