From 4af6e0bc5f524b7dc80f2bbf8bc9ce4489744885 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 16 Nov 2022 22:04:12 +0200
Subject: [PATCH] xxh: remove from pythonPackages set

error: xxh should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python pa
ckages set."}
---
 pkgs/tools/networking/xxh/default.nix | 13 +++++--------
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/python-packages.nix    |  2 --
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix
index ed1ebb0feda..eba8abbf790 100644
--- a/pkgs/tools/networking/xxh/default.nix
+++ b/pkgs/tools/networking/xxh/default.nix
@@ -1,19 +1,16 @@
 { lib
 , fetchFromGitHub
-, buildPythonApplication
-, pexpect
-, pyyaml
+, python3
 , openssh
 , nixosTests
-, pythonOlder
 }:
 
-buildPythonApplication rec{
+python3.pkgs.buildPythonApplication rec{
   pname = "xxh";
   version = "0.8.12";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = python3.pkgs.pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = pname;
@@ -23,8 +20,8 @@ buildPythonApplication rec{
   };
 
   propagatedBuildInputs = [
-    pexpect
-    pyyaml
+    python3.pkgs.pexpect
+    python3.pkgs.pyyaml
     openssh
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86cdcbd2645..b63a1d92e66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33132,7 +33132,7 @@ with pkgs;
     gtk = gtk2;
   };
 
-  xxh = with python3Packages; toPythonApplication xxh;
+  xxh = callPackage ../tools/networking/xxh { };
 
   kodiPackages = recurseIntoAttrs (kodi.packages);
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6935f3efff2..6af47e5a134 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12133,8 +12133,6 @@ self: super: with self; {
     inherit (pkgs.xorg) xorgserver;
   };
 
-  xxh = callPackage ../tools/networking/xxh { };
-
   xxhash = callPackage ../development/python-modules/xxhash { };
 
   yabadaba = callPackage ../development/python-modules/yabadaba { };