Merge branch 'staging'

This includes a security update of expat.
2016-06-29 07:47:04 +02:00
parent d9036a02b5 f4792cdc0c
commit 3afa246038
64 changed files with 529 additions and 1075 deletions
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation {
  src = fetchurl {
    inherit (s) url sha256;
  };
+  postPatch = ''
+    sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
+  '';

  cmakeFlags = [
    "-DUSE_BUNDLED_DEPS=OFF"