From 0eef6b580136f1ad38455d9a9496ab73b10d2942 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Thu, 15 Jun 2023 23:47:38 +1000 Subject: [PATCH 1/2] python3Packages.ev3dev2: fix build failure --- pkgs/development/python-modules/ev3dev2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ev3dev2/default.nix b/pkgs/development/python-modules/ev3dev2/default.nix index 5afbb7da655f..dc4720e8f903 100644 --- a/pkgs/development/python-modules/ev3dev2/default.nix +++ b/pkgs/development/python-modules/ev3dev2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; postPatch = '' - echo "${version}\n" > RELEASE-VERSION + echo "${version}" > RELEASE-VERSION ''; propagatedBuildInputs = [ pillow ]; From cd7cf98d5d90c54dc1a2489c134441ade0a41d9a Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Fri, 16 Jun 2023 00:55:21 +1000 Subject: [PATCH 2/2] python3Packages.python-ev3dev2: rename from python3Packages.ev3dev2 --- .../python-modules/{ev3dev2 => python-ev3dev2}/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{ev3dev2 => python-ev3dev2}/default.nix (96%) diff --git a/pkgs/development/python-modules/ev3dev2/default.nix b/pkgs/development/python-modules/python-ev3dev2/default.nix similarity index 96% rename from pkgs/development/python-modules/ev3dev2/default.nix rename to pkgs/development/python-modules/python-ev3dev2/default.nix index dc4720e8f903..b5fc2e4fe537 100644 --- a/pkgs/development/python-modules/ev3dev2/default.nix +++ b/pkgs/development/python-modules/python-ev3dev2/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - pname = "ev3dev2"; + pname = "python-ev3dev2"; version = "2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e5edb721f1a3..1d887b287660 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -100,6 +100,7 @@ mapAliases ({ eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 EasyProcess = easyprocess; # added 2023-02-19 email_validator = email-validator; # added 2022-06-22 + ev3dev2 = python-ev3dev2; # added 2023-06-19 Fabric = fabric; # addedd 2023-02-19 face_recognition = face-recognition; # added 2022-10-15 face_recognition_models = face-recognition-models; # added 2022-10-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de1960c8336d..77cf5878678f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3348,8 +3348,6 @@ self: super: with self; { evaluate = callPackage ../development/python-modules/evaluate { }; - ev3dev2 = callPackage ../development/python-modules/ev3dev2 { }; - evdev = callPackage ../development/python-modules/evdev { }; eve = callPackage ../development/python-modules/eve { }; @@ -9842,6 +9840,8 @@ self: super: with self; { python-ethtool = callPackage ../development/python-modules/python-ethtool { }; + python-ev3dev2 = callPackage ../development/python-modules/python-ev3dev2 { }; + python_fedora = callPackage ../development/python-modules/python_fedora { }; python-fontconfig = callPackage ../development/python-modules/python-fontconfig { };