From 68a70f098a31332531d8195bd33650f6c2c811e6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 12 Aug 2024 14:46:21 +1200 Subject: [PATCH] python3.pkgs.can: Rename to python-can This is correct name on PyPi: https://pypi.org/project/python-can --- pkgs/development/python-modules/canopen/default.nix | 4 ++-- pkgs/development/python-modules/cantools/default.nix | 4 ++-- pkgs/development/python-modules/pycyphal/default.nix | 4 ++-- .../python-modules/{can => python-can}/default.nix | 2 +- pkgs/development/python-modules/scapy/default.nix | 4 ++-- pkgs/servers/klipper/default.nix | 2 +- pkgs/tools/security/expliot/default.nix | 2 +- pkgs/tools/security/gallia/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 10 files changed, 15 insertions(+), 14 deletions(-) rename pkgs/development/python-modules/{can => python-can}/default.nix (98%) diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 90351fd00776..320dfd776b2d 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, setuptools-scm, - can, + python-can, canmatrix, pytestCheckHook, pythonOlder, @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ - can + python-can canmatrix ]; diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index 8aacef138db7..a2a65df02e91 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -3,7 +3,7 @@ argparse-addons, bitstruct, buildPythonPackage, - can, + python-can, crccheck, diskcache, fetchPypi, @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ argparse-addons bitstruct - can + python-can crccheck diskcache textparser diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index d1ccc9497678..698a9e20595a 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - can, + python-can, cobs, libpcap, nunavut, @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - transport-can-pythoncan = [ can ] ++ can.optional-dependencies.serial; + transport-can-pythoncan = [ python-can ] ++ python-can.optional-dependencies.serial; transport-serial = [ cobs pyserial diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/python-can/default.nix similarity index 98% rename from pkgs/development/python-modules/can/default.nix rename to pkgs/development/python-modules/python-can/default.nix index f4dbf575be2d..26bd3a27474e 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/python-can/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - pname = "can"; + pname = "python-can"; version = "4.4.2"; pyproject = true; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 2b643a089512..6e1ab5aad6e3 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -7,7 +7,7 @@ pycrypto, ecdsa, # TODO mock, - can, + python-can, brotli, withOptionalDeps ? true, tcpdump, @@ -86,7 +86,7 @@ buildPythonPackage rec { doCheck = false; nativeCheckInputs = [ mock - can + python-can brotli ]; checkPhase = '' diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index e749500019ac..65f018e0b0d4 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeWrapper ]; - buildInputs = [ (python3.withPackages (p: with p; [ can cffi pyserial greenlet jinja2 markupsafe numpy ])) ]; + buildInputs = [ (python3.withPackages (p: with p; [ python-can cffi pyserial greenlet jinja2 markupsafe numpy ])) ]; # we need to run this to prebuild the chelper. postBuild = '' diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index 028cacb6a0ba..b94356d97466 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -47,7 +47,7 @@ buildPythonApplication rec { aiocoap awsiotpythonsdk bluepy - can + python-can cmd2 cryptography paho-mqtt diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index 2f8c6da988c0..c671a891124f 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { aiohttp aiosqlite argcomplete - can + python-can exitcode httpx platformdirs diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index cca1a0faa604..0158a964ae2a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -87,6 +87,7 @@ mapAliases ({ BTrees = btrees; # added 2023-02-19 cacheyou = throw "cacheyou has been removed, as it was no longer used for the only consumer pdm"; # added 2023-12-21 cadquery = throw "cadquery was removed, because it was disabled on all python version since 3.8 and marked as broken"; # added 2024-05-13 + can = python-can; # added 2024-08-12 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08 cchardet = faust-cchardet; # added 2023-03-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d28a3dcb4c18..aad4ff8cb59e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1961,8 +1961,6 @@ self: super: with self; { camel-converter = callPackage ../development/python-modules/camel-converter { }; - can = callPackage ../development/python-modules/can { }; - canals = callPackage ../development/python-modules/canals { }; canmatrix = callPackage ../development/python-modules/canmatrix { }; @@ -10428,6 +10426,8 @@ self: super: with self; { pywebcopy = callPackage ../development/python-modules/pywebcopy { }; + python-can = callPackage ../development/python-modules/python-can { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-creole = callPackage ../development/python-modules/python-creole { };