diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-10-13 21:07:11 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-10-13 22:16:32 +0200 |
commit | 391c2778d4ad9cc5167387d788041c1b53be97f6 (patch) | |
tree | d00bde151fdb469da7669de893050a0e1794d576 /pkgs | |
parent | bbf3a187468b1e96af23d7d7b8374cac6ebd213d (diff) | |
download | nixpkgs-391c2778d4ad9cc5167387d788041c1b53be97f6.tar nixpkgs-391c2778d4ad9cc5167387d788041c1b53be97f6.tar.gz nixpkgs-391c2778d4ad9cc5167387d788041c1b53be97f6.tar.bz2 nixpkgs-391c2778d4ad9cc5167387d788041c1b53be97f6.tar.lz nixpkgs-391c2778d4ad9cc5167387d788041c1b53be97f6.tar.xz nixpkgs-391c2778d4ad9cc5167387d788041c1b53be97f6.tar.zst nixpkgs-391c2778d4ad9cc5167387d788041c1b53be97f6.zip |
lttng: update to latest (2.4.1 -> 2.5.0)
- This unbreaks lttng linux kernel modules[1] - lttng-tools has grown a dependency on libxml2 [1]: Build tested (for default NixOS Linux kernel) and run tested with lttng-sessiond (it successfully loads kernel modules).
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/misc/lttng-tools/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/misc/lttng-ust/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lttng-modules/default.nix | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 5758500d86f..800947e788a 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }: +{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }: stdenv.mkDerivation rec { - name = "lttng-tools-2.4.1"; + name = "lttng-tools-2.5.0"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr"; + sha256 = "19qw3v8z5kz9ls988sc1d8yczl9i1d5c6vmzna8wz790szwvin6s"; }; - buildInputs = [ popt libuuid liburcu lttng-ust ]; + buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ]; prePatch = '' sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 0cba211f28b..3c47966ac5c 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -12,11 +12,11 @@ # Debian builds with std.h (systemtap). stdenv.mkDerivation rec { - name = "lttng-ust-2.4.1"; + name = "lttng-ust-2.5.0"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "1nx9b1haiylajzjy03wgfcy85nwg578c6gy8ip55y8cabjrw0hp1"; + sha256 = "1an3ymk6hy86gp4z4py93mdyb9q8f74hq2hixbnyccr8l60vpl6w"; }; buildInputs = [ liburcu ]; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 4794cd8f96c..68012ac9a64 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { - pname = "lttng-modules-2.4.1"; + pname = "lttng-modules-2.5.0"; name = "${pname}-${kernel.version}"; src = fetchurl { url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2"; - sha256 = "1qn1qm8lwqw9ri9wfkf6k3d58gl9rwffmpbpkwx21v1fw95zi92k"; + sha256 = "0ayqi974ibaybzm46nb2ij1avqm1gspd4mnkpfc4ajl34j02dyix"; }; patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ]; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { # TODO license = with licenses; [ lgpl21 gpl2 mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = true; }; } |