@@ -1066,22 +1066,14 @@ in
10661066
10671067 bchunk = callPackage ../tools/cd-dvd/bchunk { };
10681068
1069− inherit (callPackages ../misc/logging/beats/6.x.nix {
1070− # XXX: this is failing with Go 1.12. Error is related to cgo, an
1071− # update to this package might fix it.
1072− buildGoPackage = buildGo111Package;
1073− })
1069+ inherit (callPackages ../misc/logging/beats/6.x.nix { })
10741070 filebeat6
10751071 heartbeat6
10761072 metricbeat6
10771073 packetbeat6
10781074 journalbeat6;
10791075
1080− inherit (callPackages ../misc/logging/beats/7.x.nix {
1081− # XXX: this is failing with Go 1.12. Error is related to cgo, an
1082− # update to this package might fix it.
1083− buildGoPackage = buildGo111Package;
1084− })
1076+ inherit (callPackages ../misc/logging/beats/7.x.nix { })
10851077 filebeat7
10861078 heartbeat7
10871079 metricbeat7
@@ -2873,8 +2865,8 @@ in
28732865 evemu = callPackage ../tools/system/evemu { };
28742866
28752867 # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
2876− elk6Version = "6.7.2";
2877− elk7Version = "7.0.1";
2868+ elk6Version = "6.8.3";
2869+ elk7Version = "7.3.1";
28782870
28792871 elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
28802872 utillinux = utillinuxMinimal;
@@ -2914,13 +2906,7 @@ in
29142906 sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b";
29152907 };
29162908 });
2917− pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
2918− version = "3.12";
2919− src = oldAttrs.src.override {
2920− inherit version;
2921− sha256 = "1aqjl8dk9amd4zr99n8v2qxzgmr2hdvqfma4zh7a41rj6336c9sr";
2922− };
2923− });
2909+ pyyaml = super.pyyaml_3;
29242910 };
29252911 }).pkgs; toPythonApplication elasticsearch-curator;
29262912