Merge remote-tracking branch 'origin/master' into staging

4 files changed, 35 insertions, 5 deletions

diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 4b352f512082..424a84637a53 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }:
 
 stdenv.mkDerivation rec {
-  version = "1.0";
+  version = "1.1.1";
   name = "goaccess-${version}";
 
   src = fetchurl {
     url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
-    sha256 = "1zma9p0gwxwl9kgq47i487fy1q8567fqnpik0zacjhgmpnzry3h0";
+    sha256 = "1lxnhvh4xhkgzdv0l2fiza2099phn9zs04p9cqfhhl5k6xq18wsc";
   };
 
   configureFlags = [
diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix
new file mode 100644
index 000000000000..c32a814f2328
--- /dev/null
+++ b/pkgs/tools/misc/kdecoration-viewer/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub
+, cmake, ecm, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
+
+stdenv.mkDerivation rec {
+  name = "kdecoration-viewer-2015-08-20";
+
+  src = fetchFromGitHub {
+    owner = "KDE";
+    repo = "kdecoration-viewer";
+    rev = "d7174acee01475fbdb71cfd48ca49d487a141701";
+    sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6";
+  };
+
+  buildInputs = [ cmake ecm qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
+
+  meta = with stdenv.lib; {
+    description = "Allows to preview a KDecoration plugin";
+    longDescription = ''
+      kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under
+      $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview.
+    '';
+    homepage = https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index cfce018a2361..58e7a17a57f3 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -29,7 +29,10 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper"
     ++ stdenv.lib.optional enableStatic "--enable-static";
 
-  doCheck = true;
+  # Tests are currently failing because Hydra runs builds as uid 0.
+  # It'd be better to try to fix these tests, but this is blocking
+  # all NixOS Hydra builds right now.
+  doCheck = false;
 
   preCheck =
     stdenv.lib.optionalString doCheck
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index db11875afa08..808ba21ab660 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2016.12.12";
+  version = "2016.12.15";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "643efa7755ac4aa03a241f106d8923dfd5dbaf8d3c14e56b696048c4f2fab430";
+    sha256 = "85d937a6edb8c14f8eac1b17d2e5d45574c7ec3f2cb792781ac1d8fb6a6ca39e";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;