From 7eb08d26d3976509bf2c840c43cde35930adea73 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 20 Apr 2026 14:32:48 -0500
Subject: [PATCH 1/2] trace-cmd: migrate to by-name

---
 .../trace-cmd/default.nix => by-name/tr/trace-cmd/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{os-specific/linux/trace-cmd/default.nix => by-name/tr/trace-cmd/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/by-name/tr/trace-cmd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/trace-cmd/default.nix
rename to pkgs/by-name/tr/trace-cmd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5851bf04a461..eb827c776775 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3448,8 +3448,6 @@ with pkgs;
 
   ttp = with python3.pkgs; toPythonApplication ttp;
 
-  trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
-
   translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { });
 
   translatepy = with python3.pkgs; toPythonApplication translatepy;

From cdc37f7205ccacb2002877b2b36db5dd4ebe8506 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 20 Apr 2026 14:34:42 -0500
Subject: [PATCH 2/2] trace-cmd: modernize derivation

---
 pkgs/by-name/tr/trace-cmd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/trace-cmd/package.nix b/pkgs/by-name/tr/trace-cmd/package.nix
index b197b90e5aa4..feef55ea236a 100644
--- a/pkgs/by-name/tr/trace-cmd/package.nix
+++ b/pkgs/by-name/tr/trace-cmd/package.nix
@@ -14,12 +14,12 @@
   sourceHighlight,
   gitUpdater,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "trace-cmd";
   version = "3.4";
 
   src = fetchzip {
-    url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz";
+    url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${finalAttrs.version}.tar.gz";
     hash = "sha256-7IMInvVLIjGcHZvnSzhcne+4ieFa85ep7KMn2Oy9pF8=";
   };
 
@@ -107,4 +107,4 @@ stdenv.mkDerivation rec {
       wentasah
     ];
   };
-}
+})