diff options
author | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
commit | b74793bd1c458fec6e2dfc57d83ca1f33ac0f736 (patch) | |
tree | 3a55306c8908eeecb78dedffe07bfd3e17693730 /pkgs/os-specific/linux/lttng-modules/default.nix | |
parent | f3c994ca11ecfdf1966a143abe7a5007cc1c84e7 (diff) | |
parent | 898edb0fbc3f23b24b7e28bad0cdd3e57ad5dcc7 (diff) | |
download | nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.gz nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.bz2 nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.lz nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.xz nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.zst nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.zip |
Merge branch 'master' into staging
Conflicts: pkgs/tools/system/facter/default.nix
Diffstat (limited to 'pkgs/os-specific/linux/lttng-modules/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/lttng-modules/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index eeef64c7083..10551c08077 100644 --- 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" ]; |