Merge branch 'master' into staging

Conflicts: pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
parent f3c994ca11 898edb0fbc
commit b74793bd1c
21 changed files with 291 additions and 208 deletions
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
  pname = "lttng-modules-${version}";
  name = "${pname}-${kernel.version}";
-  version = "2.6.3";
+  version = "2.8.0";

  src = fetchurl {
    url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
-    sha256 = "0sk7cyjf5ylmxqrrrz5zmmw4c0dmxh1f98aj870gmcnxfa76y4mx";
+    sha256 = "0a9xwq0kgpx1y800l232h524f19g3py6cnxff10j9p01q6lzhrxh";
  };

  hardeningDisable = [ "pic" ];