diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-28 13:44:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-28 17:46:39 +0000 |
| commit | cab13e087c80c4e7476bb7df432e2b7deb56563d (patch) | |
| tree | f8c7f771072bc7c5453625dfdb80cbd3d2c30fb4 /pkgs/os-specific/linux/lttng-modules/default.nix | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | 8ecc61c91a596df7d3293603a9c2384190c1b89a (diff) | |
| download | nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.gz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.bz2 nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.lz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.xz nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.tar.zst nixpkgs-cab13e087c80c4e7476bb7df432e2b7deb56563d.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into nixpkgs-update
Conflicts: pkgs/applications/graphics/hello-wayland/default.nix pkgs/applications/virtualization/cloud-hypervisor/default.nix pkgs/applications/window-managers/tinywl/default.nix pkgs/applications/window-managers/wayfire/applications.nix pkgs/applications/window-managers/wayfire/default.nix pkgs/applications/window-managers/wayfire/wcm.nix pkgs/applications/window-managers/wayfire/wf-config.nix pkgs/applications/window-managers/wayfire/wf-shell.nix pkgs/development/libraries/wlroots/default.nix pkgs/os-specific/linux/chromium-os/crosvm/default.nix pkgs/os-specific/linux/kernel/common-config.nix pkgs/os-specific/linux/kernel/patches.nix pkgs/os-specific/linux/mdevd/default.nix pkgs/os-specific/linux/s6-linux-init/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/lttng-modules/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/lttng-modules/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 30d4a29b166..7f4036c775f 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { - pname = "lttng-modules-${version}"; - name = "${pname}-${kernel.version}"; - version = "2.10.5"; + pname = "lttng-modules-${kernel.version}"; + version = "2.12.6"; src = fetchurl { url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq"; + sha256 = "sha256-lawqLPkthdI/+9rKah7A18FnIR0eD7hQq5AASj9HXqo="; }; buildInputs = kernel.moduleBuildDependencies; @@ -25,14 +24,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux kernel modules for LTTng tracing"; homepage = "https://lttng.org/"; - license = with licenses; [ lgpl21 gpl2 mit ]; + license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = builtins.compareVersions kernel.version "3.18" == -1 - || builtins.compareVersions kernel.version "4.16" == 1; }; - } |