From 34a148963d4c55d3f7549655218d12b860478eae Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 5 Apr 2025 09:57:07 -0500
Subject: [PATCH] lttng-ust: Migrate to by-name

---
 .../lt/lttng-ust/package.nix}                 |  6 +-
 pkgs/by-name/lt/lttng-ust_2_12/package.nix    | 69 +++++++++++++++++++
 .../development/tools/misc/lttng-ust/2.12.nix |  4 --
 .../tools/misc/lttng-ust/default.nix          |  4 --
 pkgs/top-level/all-packages.nix               |  4 --
 5 files changed, 71 insertions(+), 16 deletions(-)
 rename pkgs/{development/tools/misc/lttng-ust/generic.nix => by-name/lt/lttng-ust/package.nix} (92%)
 create mode 100644 pkgs/by-name/lt/lttng-ust_2_12/package.nix
 delete mode 100644 pkgs/development/tools/misc/lttng-ust/2.12.nix
 delete mode 100644 pkgs/development/tools/misc/lttng-ust/default.nix

diff --git a/pkgs/development/tools/misc/lttng-ust/generic.nix b/pkgs/by-name/lt/lttng-ust/package.nix
similarity index 92%
rename from pkgs/development/tools/misc/lttng-ust/generic.nix
rename to pkgs/by-name/lt/lttng-ust/package.nix
index 6125bfb7dbbe..4b5cb17a9c7f 100644
--- a/pkgs/development/tools/misc/lttng-ust/generic.nix
+++ b/pkgs/by-name/lt/lttng-ust/package.nix
@@ -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 = [
diff --git a/pkgs/by-name/lt/lttng-ust_2_12/package.nix b/pkgs/by-name/lt/lttng-ust_2_12/package.nix
new file mode 100644
index 000000000000..9a2b2579911b
--- /dev/null
+++ b/pkgs/by-name/lt/lttng-ust_2_12/package.nix
@@ -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 ];
+  };
+
+}
diff --git a/pkgs/development/tools/misc/lttng-ust/2.12.nix b/pkgs/development/tools/misc/lttng-ust/2.12.nix
deleted file mode 100644
index b3ef1fe65e7f..000000000000
--- a/pkgs/development/tools/misc/lttng-ust/2.12.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./generic.nix {
-  version = "2.12.2";
-  sha256 = "sha256-vNDwZLbKiMcthOdg6sNHKuXIKEEcY0Q1kivun841n8c=";
-}
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
deleted file mode 100644
index 7a0a918db74d..000000000000
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./generic.nix {
-  version = "2.13.8";
-  sha256 = "sha256-1O+Y2rmjetT1JMyv39UK9PJmA5tSjdWvq8545JAk2Tc=";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ab5698e8162..f6be86624333 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;