diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-03-24 07:05:25 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-03-24 07:10:12 +0100 |
| commit | ff9bc819461bd234d8b22f26ccf9784738275c6e (patch) | |
| tree | 87b0f25cdf21d385b10aac073804af7f4715912f /pkgs/os-specific/linux/lttng-modules/default.nix | |
| parent | c3bc040128da089d897340ed9f365c08828d7b97 (diff) | |
| download | nixpkgs-ff9bc819461bd234d8b22f26ccf9784738275c6e.tar nixpkgs-ff9bc819461bd234d8b22f26ccf9784738275c6e.tar.gz nixpkgs-ff9bc819461bd234d8b22f26ccf9784738275c6e.tar.bz2 nixpkgs-ff9bc819461bd234d8b22f26ccf9784738275c6e.tar.lz nixpkgs-ff9bc819461bd234d8b22f26ccf9784738275c6e.tar.xz nixpkgs-ff9bc819461bd234d8b22f26ccf9784738275c6e.tar.zst nixpkgs-ff9bc819461bd234d8b22f26ccf9784738275c6e.zip | |
lttng-modules: update to latest stable (fixes build)
Fixes build against linux 3.14.36+. Also * It works with linux 3.12 now, so remove that assert * Remove unneeded patches (merged upstream)
Diffstat (limited to 'pkgs/os-specific/linux/lttng-modules/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/lttng-modules/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 871edf87b7a..5fe065d3cc6 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchgit, kernel }: assert stdenv.lib.versionAtLeast kernel.version "3.4"; # fails on 3.2 -assert builtins.substring 0 4 kernel.version != "3.12"; stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.6.0-rc1"; # "git describe bf2ba318fff" + version = "2.6.0-5-g1b2a542"; - src = fetchurl { - url = "https://github.com/lttng/lttng-modules/archive/v${version}.tar.gz"; - sha256 = "01gha02ybbzr86v6s6bqn649jiw5k89kb363b9s1iv8igrdlzhl1"; + src = fetchgit { + url = "https://github.com/lttng/lttng-modules.git"; + rev = "1b2a5429de815c95643df2eadf91253909708728"; + sha256 = "0zccaiadnk0xl6xrqaqlg9rpkwjgbq2fiyc3psylzqimnx0ydxc2"; }; - # from upstream ML, should be in the next release - patches = [ ./build-fix.patch ./6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch ]; - preConfigure = '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export INSTALL_MOD_PATH="$out" |