diff --git a/pkgs/development/python-modules/libgpiod/default.nix b/pkgs/development/python-modules/gpiod/default.nix similarity index 80% rename from pkgs/development/python-modules/libgpiod/default.nix rename to pkgs/development/python-modules/gpiod/default.nix index 6a1c3ca6f1d5..248dffdcc939 100644 --- a/pkgs/development/python-modules/libgpiod/default.nix +++ b/pkgs/development/python-modules/gpiod/default.nix @@ -2,10 +2,14 @@ lib, buildPythonPackage, libgpiod, + setuptools, }: buildPythonPackage { - inherit (libgpiod) pname version src; - format = "setuptools"; + pname = "gpiod"; + inherit (libgpiod) version src; + pyproject = true; + + build-system = [ setuptools ]; buildInputs = [ libgpiod ]; diff --git a/pkgs/development/python-modules/gpiodevice/default.nix b/pkgs/development/python-modules/gpiodevice/default.nix index 0cba569db157..f024870aaedc 100644 --- a/pkgs/development/python-modules/gpiodevice/default.nix +++ b/pkgs/development/python-modules/gpiodevice/default.nix @@ -6,7 +6,7 @@ fetchFromGitHub, hatchling, hatch-fancy-pypi-readme, - libgpiod, + gpiod, mock, }: buildPythonPackage (finalAttrs: { @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { ]; dependencies = [ - libgpiod + gpiod ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index c415b0d11680..9b2a23664e2b 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -12,7 +12,7 @@ click, coloredlogs, crc, - libgpiod, + gpiod, pyserial-asyncio-fast, typing-extensions, zigpy, @@ -53,7 +53,7 @@ buildPythonPackage rec { typing-extensions zigpy ] - ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ]; + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ gpiod ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/servers/home-assistant/custom-components/gpio/package.nix b/pkgs/servers/home-assistant/custom-components/gpio/package.nix index 9c53c94e7ee8..327ad206cb4d 100644 --- a/pkgs/servers/home-assistant/custom-components/gpio/package.nix +++ b/pkgs/servers/home-assistant/custom-components/gpio/package.nix @@ -2,7 +2,7 @@ lib, buildHomeAssistantComponent, fetchFromCodeberg, - libgpiod, + gpiod, }: buildHomeAssistantComponent rec { @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-JyyJPI0lbZLJj+016WgS1KXU5rnxUmRMafel4/wKsYk="; }; - dependencies = [ libgpiod ]; + dependencies = [ gpiod ]; meta = { description = "Home Assistant GPIO custom integration"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3f7af9295e62..139c2c39f18f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -287,6 +287,7 @@ mapAliases { lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29 ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29 ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29 + libgpiod = gpiod; # added 2026-03-30 libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03 line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29 linear-garage-door = throw "'linear-garage-door' has been superseded by 'nice-go'"; # Added 2025-11-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 115f36295c15..9a842d71a989 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6597,6 +6597,8 @@ self: super: with self; { gpib-ctypes = callPackage ../development/python-modules/gpib-ctypes { }; + gpiod = callPackage ../development/python-modules/gpiod { inherit (pkgs) libgpiod; }; + gpiodevice = callPackage ../development/python-modules/gpiodevice { }; gpiozero = callPackage ../development/python-modules/gpiozero { }; @@ -8699,8 +8701,6 @@ self: super: with self; { libfive = toPythonModule (pkgs.libfive.override { python3 = python; }); - libgpiod = callPackage ../development/python-modules/libgpiod { inherit (pkgs) libgpiod; }; - libgravatar = callPackage ../development/python-modules/libgravatar { }; libiio =