lttng-ust: Migrate to by-name

This commit is contained in:
Guy Chronister
2025-04-05 09:57:07 -05:00
parent 9756c0decb
commit 34a148963d
5 changed files with 71 additions and 16 deletions

View File

@@ -1,5 +1,3 @@
{ version, sha256 }:
{
lib,
stdenv,
@@ -23,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "lttng-ust";
inherit version;
version = "2.13.8";
src = fetchurl {
url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
inherit sha256;
sha256 = "sha256-1O+Y2rmjetT1JMyv39UK9PJmA5tSjdWvq8545JAk2Tc=";
};
outputs = [

View File

@@ -0,0 +1,69 @@
{
lib,
stdenv,
fetchurl,
pkg-config,
liburcu,
numactl,
python3,
}:
# NOTE:
# ./configure ...
# [...]
# LTTng-UST will be built with the following options:
#
# Java support (JNI): Disabled
# sdt.h integration: Disabled
# [...]
#
# Debian builds with std.h (systemtap).
stdenv.mkDerivation rec {
pname = "lttng-ust";
version = "2.12.2";
src = fetchurl {
url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
sha256 = "sha256-vNDwZLbKiMcthOdg6sNHKuXIKEEcY0Q1kivun841n8c=";
};
outputs = [
"bin"
"out"
"dev"
"devdoc"
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
numactl
python3
];
preConfigure = ''
patchShebangs .
'';
hardeningDisable = [ "trivialautovarinit" ];
configureFlags = [ "--disable-examples" ];
propagatedBuildInputs = [ liburcu ];
enableParallelBuilding = true;
meta = with lib; {
description = "LTTng Userspace Tracer libraries";
mainProgram = "lttng-gen-tp";
homepage = "https://lttng.org/";
license = with licenses; [
lgpl21Only
gpl2Only
mit
];
platforms = lib.intersectLists platforms.linux liburcu.meta.platforms;
maintainers = [ maintainers.bjornfor ];
};
}

View File

@@ -1,4 +0,0 @@
import ./generic.nix {
version = "2.12.2";
sha256 = "sha256-vNDwZLbKiMcthOdg6sNHKuXIKEEcY0Q1kivun841n8c=";
}

View File

@@ -1,4 +0,0 @@
import ./generic.nix {
version = "2.13.8";
sha256 = "sha256-1O+Y2rmjetT1JMyv39UK9PJmA5tSjdWvq8545JAk2Tc=";
}

View File

@@ -8536,10 +8536,6 @@ with pkgs;
lit = with python3Packages; toPythonApplication lit;
lttng-ust = callPackage ../development/tools/misc/lttng-ust { };
lttng-ust_2_12 = callPackage ../development/tools/misc/lttng-ust/2.12.nix { };
massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
maven3 = maven;