From a83d7d1bd803adc1f743ce088f97c0791dbe9001 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 21:07:02 -0700
Subject: [PATCH 1/2] sosreport: use callPackage

---
 pkgs/applications/logging/sosreport/default.nix | 12 ++++--------
 pkgs/top-level/all-packages.nix                 |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix
index ccd49916804d..af8f7c768f2d 100644
--- a/pkgs/applications/logging/sosreport/default.nix
+++ b/pkgs/applications/logging/sosreport/default.nix
@@ -1,15 +1,11 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchFromGitHub,
   gettext,
-  packaging,
-  pexpect,
-  pyyaml,
-  setuptools,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "sosreport";
   version = "4.9.1";
   pyproject = true;
@@ -21,13 +17,13 @@ buildPythonPackage rec {
     hash = "sha256-97S8b4PfjUN8uzvp01PGCLs4J3CbwpJsgBKtY8kI0HE=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ python3Packages.setuptools ];
 
   nativeBuildInputs = [
     gettext
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     packaging
     pexpect
     pyyaml
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad1bacc7f5e4..41cafc4ae8cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12783,7 +12783,7 @@ with pkgs;
     singularity-overriden-nixos
     ;
 
-  sosreport = python3Packages.callPackage ../applications/logging/sosreport { };
+  sosreport = callPackage ../applications/logging/sosreport { };
 
   inherit (callPackages ../development/libraries/wlroots { })
     wlroots_0_17

From 8e1f90866b0e5059c172e3ce9f21fa60d903626f Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 21:08:03 -0700
Subject: [PATCH 2/2] sosreport: move to by-name

---
 .../sosreport/default.nix => by-name/so/sosreport/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/logging/sosreport/default.nix => by-name/so/sosreport/package.nix} (100%)

diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/by-name/so/sosreport/package.nix
similarity index 100%
rename from pkgs/applications/logging/sosreport/default.nix
rename to pkgs/by-name/so/sosreport/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41cafc4ae8cc..f9449ad34c7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12783,8 +12783,6 @@ with pkgs;
     singularity-overriden-nixos
     ;
 
-  sosreport = callPackage ../applications/logging/sosreport { };
-
   inherit (callPackages ../development/libraries/wlroots { })
     wlroots_0_17
     wlroots_0_18