public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lttng: update to latest (2.4.1 -> 2.5.0)

Browse Source 
- 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).
This commit is contained in:
Bjørn Forsman 2014-10-13 21:07:11 +02:00
parent bbf3a18746
commit 391c2778d4
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/misc/lttng-tools/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }: { stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lttng-tools-2.4.1"; name = "lttng-tools-2.5.0";
src = fetchurl { src = fetchurl {
url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; 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 = '' prePatch = ''
sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \

4
pkgs/development/tools/misc/lttng-ust/default.nix
View File

@ -12,11 +12,11 @@
# Debian builds with std.h (systemtap). # Debian builds with std.h (systemtap).
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lttng-ust-2.4.1"; name = "lttng-ust-2.5.0";
src = fetchurl { src = fetchurl {
url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
sha256 = "1nx9b1haiylajzjy03wgfcy85nwg578c6gy8ip55y8cabjrw0hp1"; sha256 = "1an3ymk6hy86gp4z4py93mdyb9q8f74hq2hixbnyccr8l60vpl6w";
}; };
buildInputs = [ liburcu ]; buildInputs = [ liburcu ];

5
pkgs/os-specific/linux/lttng-modules/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, kernel }: { stdenv, fetchurl, kernel }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lttng-modules-2.4.1"; pname = "lttng-modules-2.5.0";
name = "${pname}-${kernel.version}"; name = "${pname}-${kernel.version}";
src = fetchurl { src = fetchurl {
url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2"; url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2";
sha256 = "1qn1qm8lwqw9ri9wfkf6k3d58gl9rwffmpbpkwx21v1fw95zi92k"; sha256 = "0ayqi974ibaybzm46nb2ij1avqm1gspd4mnkpfc4ajl34j02dyix";
}; };
patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ]; patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ];
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
# TODO license = with licenses; [ lgpl21 gpl2 mit ]; # TODO license = with licenses; [ lgpl21 gpl2 mit ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];
broken = true;
}; };
} }