6 files changed, 85 insertions, 9 deletions
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 56f63e747342..1dd34fa23c33 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, kernel, libelf }:
 
 stdenv.mkDerivation rec {
   name = "vhba-${version}";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];
+  buildInputs = [ libelf ];
 
   hardeningDisable = [ "pic" ];
 
diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/5.x.nix
index e3333fa5caac..ed2a2eadb65a 100644
--- a/pkgs/misc/logging/beats/default.nix
+++ b/pkgs/misc/logging/beats/5.x.nix
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
         owner = "elastic";
         repo = "beats";
         rev = "v${version}";
-        sha256 = "1lbdi4c0y4bfkmim9q98ravknv4yw0dl3z57c3w5aqhi2sx0w23h";
+        sha256 = "0pp4in66byggcfmvf8yx0m1vra98cs77m7mbr45sdla4hinvaqar";
       };
 
       goPackagePath = "github.com/elastic/beats";
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
new file mode 100644
index 000000000000..48c2fb6973fe
--- /dev/null
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap }:
+
+let beat = package : extraArgs : buildGoPackage (rec {
+      name = "${package}-${version}";
+      version = elk6Version;
+
+      src = fetchFromGitHub {
+        owner = "elastic";
+        repo = "beats";
+        rev = "v${version}";
+        sha256 = "1vifxa0v6ha29ijvgnrkx02syckhydg6vjxjqbm8y8zysvnh1869";
+      };
+
+      goPackagePath = "github.com/elastic/beats";
+
+      subPackages = [ package ];
+
+      meta = with stdenv.lib; {
+        homepage = https://www.elastic.co/products/beats;
+        license = licenses.asl20;
+        maintainers = with maintainers; [ fadenb basvandijk ];
+        platforms = platforms.linux;
+      };
+    } // extraArgs);
+in {
+  filebeat   = beat "filebeat"   {meta.description = "Lightweight shipper for logfiles";};
+  heartbeat  = beat "heartbeat"  {meta.description = "Lightweight shipper for uptime monitoring";};
+  metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";};
+  packetbeat = beat "packetbeat" {
+    buildInputs = [ libpcap ];
+    meta.description = "Network packet analyzer that ships data to Elasticsearch";
+    meta.longDescription = ''
+      Packetbeat is an open source network packet analyzer that ships the
+      data to Elasticsearch.
+
+      Think of it like a distributed real-time Wireshark with a lot more
+      analytics features. The Packetbeat shippers sniff the traffic between
+      your application processes, parse on the fly protocols like HTTP, MySQL,
+      PostgreSQL, Redis or Thrift and correlate the messages into transactions.
+    '';
+  };
+}
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
index 5eead87b1c7b..4b7702ed6359 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/pkgs/misc/themes/blackbird/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "Blackbird";
-  version = "2017-02-20";
+  version = "2017-12-13";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     repo = "${pname}";
     owner = "shimmerproject";
-    rev = "51eaa1853675866e2e4bd026876162b35ab1a196";
-    sha256 = "06d040s5jmw9v6fkif6zjcd3lp56dmvwchcwflinc165iazbp5n2";
+    rev = "a1c5674c0ec38b4cc8ba41d2c0e6187987ae7eb4";
+    sha256 = "0xskcw36ci2ykra5gir5pkrawh2qkcv18p4fp2kxivssbd20d4jw";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/misc/themes/plano/default.nix
new file mode 100644
index 000000000000..64d4e807e425
--- /dev/null
+++ b/pkgs/misc/themes/plano/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "plano-theme-${version}";
+  version = "3.24-3";
+
+  src = fetchFromGitHub {
+    owner = "lassekongo83";
+    repo = "plano-theme";
+    rev = "v${version}";
+    sha256 = "079gj3kgsim01r7yb9dcxvrci3my1y0zkn86igdlspxcnjzmxkq0";
+  };
+
+  buildInputs = [ gdk_pixbuf gtk_engines ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -dm 755 $out/share/themes/Plano
+    cp -a * $out/share/themes/Plano/
+    rm $out/share/themes/Plano/{LICENSE,README.md}
+  '';
+
+  meta = {
+    description = "Flat theme for GNOME & Xfce4";
+    homepage = https://github.com/lassekongo83/plano-theme;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
index 00743a345c93..1d5b7ad311cf 100644
--- a/pkgs/misc/themes/zuki/default.nix
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "zuki-themes-${version}";
-  version = "3.24-2";
+  version = "3.24-3";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "zuki-themes";
     rev = "v${version}";
-    sha256 = "1js92qq1zi3iq40nl6n0m52hhhn9ql9i7y8ycg8vw3w0v8xyb4km";
+    sha256 = "02zallh1kwxp3sarz6nxm6j7v1rf6wwz7gf8gn81xslqjg188dq6";
   };
 
   buildInputs = [ gdk_pixbuf gtk_engines ];
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     install -dm 755 $out/share/themes
-    cp -va Zuki* $out/share/themes/
+    cp -a Zuki* $out/share/themes/
   '';
 
   meta = {
-    description = "A selection of themes for GTK3, gnome-shell and more";
+    description = "Themes for GTK3, gnome-shell and more";
     homepage = https://github.com/lassekongo83/zuki-themes;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;