Commit 54868995 authored by Artturin's avatar Artturin Committed by github-actions[bot]
Browse files

xxh: remove from pythonPackages set 

error: xxh should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python pa
ckages set."}

(cherry picked from commit 4af6e0bc)
parent 40cf41a5

pkgs/tools/networking/xxh/default.nix

+5 −8
Original line number Diff line number Diff line 
{ 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

  ];

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -33100,7 +33100,7 @@ with pkgs; 
    gtk = gtk2;

  };













  xxh = with python3Packages; toPythonApplication xxh;













  xxh = callPackage ../tools/networking/xxh { };





























  kodiPackages = recurseIntoAttrs (kodi.packages);







































pkgs/top-level/python-packages.nix



+0
−2






























Original line number
Diff line number
Diff line








@@ -12129,8 +12129,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 { };