Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 20e1833914b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 676560af2508
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 17, 2017

  1. linuxPackages.lttng-modules: 2.9.3 -> 2.10.0 

    (cherry picked from commit 9e39554)
    @joachifm @bjornfor
    joachifm authored and bjornfor committed Sep 17, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    5946d7d View commit details

  2. linuxPackages.lttng-modules: broken on kernels >4.11 

    (cherry picked from commit 7d69e5a)
    @joachifm @bjornfor
    joachifm authored and bjornfor committed Sep 17, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b967357 View commit details

  3. lttng-tools: 2.9.5 -> 2.10.1 

    (cherry picked from commit 969db57)
    @joachifm @bjornfor
    joachifm authored and bjornfor committed Sep 17, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    622afa9 View commit details

  4. lttng-uts: 2.9.1 -> 2.10.0 

    (cherry picked from commit 40d6414)
    @joachifm @bjornfor
    joachifm authored and bjornfor committed Sep 17, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    676560a View commit details
4 changes: 2 additions & 2 deletions pkgs/development/tools/misc/lttng-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "lttng-tools-${version}";
version = "2.9.5";
version = "2.10.1";

src = fetchurl {
url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
sha256 = "073kzfiwgvz7c10hihjwn1p53hh1jwvdkkway0jj2rbczjv9x0vp";
sha256 = "005axllajfbxh73vh1cacbapdvbxjsi3pkzq40giih4ps9x4pg10";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/misc/lttng-ust/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@

stdenv.mkDerivation rec {
name = "lttng-ust-${version}";
version = "2.9.1";
version = "2.10.0";

src = fetchurl {
url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
sha256 = "196snxrs1p205jz566rwxh7dqzsa3k16c7vm6k7i3gdvrmkx54dq";
sha256 = "1avx4p71g9m3zvynhhhysxnpkqyhhlv42xiv9502bvp3nwfkgnqs";
};

buildInputs = [ liburcu python ];
7 changes: 4 additions & 3 deletions pkgs/os-specific/linux/lttng-modules/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "lttng-modules-${version}";
name = "${pname}-${kernel.version}";
version = "2.9.3";
version = "2.10.0";

src = fetchurl {
url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
sha256 = "1zms8q199489ym0x1ri54napyi6pva80641x9x3qg9q23flbq4gr";
sha256 = "1gzi7j97zymzfj6b7mlih35djflwfgg93b63q9rbs5w1kclmsrgz";
};

hardeningDisable = [ "pic" ];
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
license = with licenses; [ lgpl21 gpl2 mit ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
broken = builtins.compareVersions kernel.version "3.18" == -1;
broken = builtins.compareVersions kernel.version "3.18" == -1
|| builtins.compareVersions kernel.version "4.11" == 1;
};

}