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

pkgs/misc/drivers/hplip/default.nix

@@ -10,16 +10,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.16.5";
+  version = "3.16.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "1nay65q1zmx2jxiwn66n7mlr73azacz5097gw98kqqf90dh522f6";
+    sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn";
   };
 
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "15qrcd3ndnxri6pfdfmsjyv2f3zfkig80yghs76jbsm106rp8g3q";
+    sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg";
   };
 
   hplipState =

pkgs/misc/logging/filebeat/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "filebeat-${version}";
+  version = "5.2.2";
+
+  src = fetchFromGitHub {
+    owner = "elastic";
+    repo = "beats";
+    rev = "v${version}";
+    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
+  };
+
+  goPackagePath = "github.com/elastic/beats";
+
+  subPackages = [ "filebeat" ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight shipper for logfiles";
+    homepage = https://www.elastic.co/products/beats;
+    license = licenses.asl20;
+    maintainers = [ maintainers.fadenb ];
+    platforms = platforms.linux;
+  };
+}

pkgs/misc/logging/heartbeat/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "heartbeat-${version}";
+  version = "5.2.2";
+
+  src = fetchFromGitHub {
+    owner = "elastic";
+    repo = "beats";
+    rev = "v${version}";
+    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
+  };
+
+  goPackagePath = "github.com/elastic/beats";
+
+  subPackages = [ "heartbeat" ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight shipper for uptime monitoring";
+    homepage = https://www.elastic.co/products/beats;
+    license = licenses.asl20;
+    maintainers = [ maintainers.fadenb ];
+    platforms = platforms.linux;
+  };
+}

pkgs/misc/logging/metricbeat/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "metricbeat-${version}";
+  version = "5.2.2";
+
+  src = fetchFromGitHub {
+    owner = "elastic";
+    repo = "beats";
+    rev = "v${version}";
+    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
+  };
+
+  goPackagePath = "github.com/elastic/beats";
+
+  subPackages = [ "metricbeat" ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight shipper for metrics";
+    homepage = https://www.elastic.co/products/beats;
+    license = licenses.asl20;
+    maintainers = [ maintainers.fadenb ];
+    platforms = platforms.linux;
+  };
+}

pkgs/misc/logging/packetbeat/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, buildGoPackage, libpcap }:
+
+buildGoPackage rec {
+  name = "packetbeat-${version}";
+  version = "5.2.2";
+
+  src = fetchFromGitHub {
+    owner = "elastic";
+    repo = "beats";
+    rev = "v${version}";
+    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
+  };
+
+  goPackagePath = "github.com/elastic/beats";
+
+  subPackages = [ "packetbeat" ];
+
+  buildInputs = [ libpcap ];
+
+  meta = with stdenv.lib; {
+    description = "Network packet analyzer that ships data to Elasticsearch";
+    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.
+    '';
+    homepage = https://www.elastic.co/products/beats;
+    license = licenses.asl20;
+    maintainers = [ maintainers.fadenb ];
+    platforms = platforms.linux;
+  };
+}

pkgs/misc/uboot/default.nix

@@ -83,6 +83,12 @@ in rec {
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
   };
 
+  ubootOdroidXU3 = buildUBoot rec {
+    defconfig = "odroid-xu3_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot-dtb.bin"];
+  };
+
   ubootPcduino3Nano = buildUBoot rec {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
     targetPlatforms = ["armv7l-linux"];