Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/tools/misc/brltty/default.nix

@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez }:
+{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }:
 
 assert alsaSupport -> alsaLib != null;
+assert systemdSupport -> systemd != null;
 
 stdenv.mkDerivation rec {
-  name = "brltty-5.2";
+  name = "brltty-5.4";
   
   src = fetchurl {
     url = "http://brltty.com/archive/${name}.tar.gz";
-    sha256 = "1zaab5pxkqrv081n23p3am445d30gk0km4azqdirvcpw9z15q0cz";
+    sha256 = "1993brxa76yf7z3ckax0bbmqv6jp8vjwxp19h425v4gpm0m17k7l";
   };
+
+  patches = [ ./systemd.patch ];
   
-  buildInputs = [ pkgconfig alsaLib bluez ]
-    ++ stdenv.lib.optional alsaSupport alsaLib;
+  buildInputs = [ pkgconfig bluez ]
+    ++ stdenv.lib.optional alsaSupport alsaLib
+    ++ stdenv.lib.optional systemdSupport systemd;
   
   meta = {
     description = "Access software for a blind person using a braille display";
@@ -27,7 +31,9 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
   };
   
-  patchPhase = ''
+  preConfigurePhases = [ "preConfigure" ];
+
+  preConfigure = ''
     substituteInPlace configure --replace /sbin/ldconfig ldconfig
   '';
 }

pkgs/tools/misc/brltty/systemd.patch

@@ -0,0 +1,22 @@
+diff --git a/config.mk.in b/config.mk.in
+index 5093b9c..b707bd4 100644
+--- a/config.mk.in
++++ b/config.mk.in
+@@ -235,7 +235,7 @@ TUNE_OBJECTS = tune.$O notes.$O $(BEEP_OBJECTS) $(PCM_OBJECTS) $(MIDI_OBJECTS) $
+ ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O
+ BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS)
+ OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS)
+-PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
++PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
+ 
+ CC = @CC@
+ CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@
+@@ -248,7 +248,7 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@
+ 
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+-LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@
++LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) $(SERVICE_LIBS) @LIBS@
+ 
+ MKOBJ = @MKOBJ@
+ MKMOD = @MKMOD@

pkgs/tools/misc/kargo/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  version = "0.4.6";
+  name = "kargo-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/k/kargo/${name}.tar.gz";
+    sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b";
+  };
+
+  doCheck = false;
+
+  propagatedBuildInputs = with pythonPackages; [
+    ansible2
+    boto
+    cffi
+    cryptography
+    libcloud
+    markupsafe
+    netaddr
+    pyasn1
+    requests2
+    setuptools
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kubespray/kargo-cli;
+    description = "A tool helps to deploy a kubernetes cluster with Ansible.";
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [
+      jgeerds
+    ];
+  };
+}

pkgs/tools/misc/youtube-dl/default.nix

@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2016.10.19";
+  version = "2016.10.25";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "ed8d4a247c4cfffe2a1171b4f9c20be19e84d96bcf3716f46988c8503b1b7713";
+    sha256 = "920048c6ff2f7f2c4b55c1ba4810e85f76efd814118e59b3568bdc2c38024697";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;