xxh: remove from pythonPackages set
error: xxh should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python pa ckages set."}
This commit is contained in:
parent
81db0fc59c
commit
4af6e0bc5f
|
@ -1,19 +1,16 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, buildPythonApplication
|
, python3
|
||||||
, pexpect
|
|
||||||
, pyyaml
|
|
||||||
, openssh
|
, openssh
|
||||||
, nixosTests
|
, nixosTests
|
||||||
, pythonOlder
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonApplication rec{
|
python3.pkgs.buildPythonApplication rec{
|
||||||
pname = "xxh";
|
pname = "xxh";
|
||||||
version = "0.8.12";
|
version = "0.8.12";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = python3.pkgs.pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
|
@ -23,8 +20,8 @@ buildPythonApplication rec{
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
pexpect
|
python3.pkgs.pexpect
|
||||||
pyyaml
|
python3.pkgs.pyyaml
|
||||||
openssh
|
openssh
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -33132,7 +33132,7 @@ with pkgs;
|
||||||
gtk = gtk2;
|
gtk = gtk2;
|
||||||
};
|
};
|
||||||
|
|
||||||
xxh = with python3Packages; toPythonApplication xxh;
|
xxh = callPackage ../tools/networking/xxh { };
|
||||||
|
|
||||||
kodiPackages = recurseIntoAttrs (kodi.packages);
|
kodiPackages = recurseIntoAttrs (kodi.packages);
|
||||||
|
|
||||||
|
|
|
@ -12133,8 +12133,6 @@ self: super: with self; {
|
||||||
inherit (pkgs.xorg) xorgserver;
|
inherit (pkgs.xorg) xorgserver;
|
||||||
};
|
};
|
||||||
|
|
||||||
xxh = callPackage ../tools/networking/xxh { };
|
|
||||||
|
|
||||||
xxhash = callPackage ../development/python-modules/xxhash { };
|
xxhash = callPackage ../development/python-modules/xxhash { };
|
||||||
|
|
||||||
yabadaba = callPackage ../development/python-modules/yabadaba { };
|
yabadaba = callPackage ../development/python-modules/yabadaba { };
|
||||||
|
|
Loading…
Reference in a new issue