From 81f18468ae3e5a2d0612b5ab43ff74fa3a07f7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 10 Jan 2025 16:22:04 +0100 Subject: [PATCH 1/3] python312Packages.gattlib: use release tag --- pkgs/development/python-modules/gattlib/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index 370b773c8934..beb2e482d723 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -16,19 +16,16 @@ }: -let +buildPythonPackage rec { pname = "gattlib"; - version = "unstable-2021-06-16"; -in -buildPythonPackage { - inherit pname version; + version = "20210616"; format = "setuptools"; src = fetchFromGitHub { owner = "oscaracena"; repo = "pygattlib"; - rev = "7bdb229124fe7d9f4a2cc090277b0fdef82e2a56"; - hash = "sha256-PS5DIH1JuH2HweyebLLM+UNFGY/XsjKIrsD9x7g7yMI="; + rev = "v.${version}"; + hash = "sha256-n3D9CWKvgw4FYmbvsfhaHN963HARBG0p4CcZBC8Gkb0="; }; patches = [ From 493d7f0cba1585b66e1e6f74334630d4a226fbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 10 Jan 2025 16:22:41 +0100 Subject: [PATCH 2/3] python312Packages.gattlib: switch to pyproject = true --- pkgs/development/python-modules/gattlib/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index beb2e482d723..ed264beccb59 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -3,23 +3,19 @@ buildPythonPackage, fetchFromGitHub, substituteAll, - - # build pkg-config, glibc, python, - - # runtime + setuptools, bluez, boost, glib, - }: buildPythonPackage rec { pname = "gattlib"; version = "20210616"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "oscaracena"; @@ -39,6 +35,8 @@ buildPythonPackage rec { }) ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config glibc From e9004165ee77df1ee4b5676e4e5b41902c0fb726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 10 Jan 2025 16:22:53 +0100 Subject: [PATCH 3/3] python313Packages.gattlib: fix build against Python 3.13 --- pkgs/development/python-modules/gattlib/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index ed264beccb59..bb961a993a13 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, substituteAll, pkg-config, glibc, @@ -25,6 +26,11 @@ buildPythonPackage rec { }; patches = [ + # Fix build for Python 3.13 + (fetchpatch { + url = "https://github.com/oscaracena/pygattlib/commit/73a73b71cfc139e1e0a08816fb976ff330c77ea5.patch"; + hash = "sha256-/Y/CZNdN/jcxWroqRfdCH2rPUxZUbug668MIAow0scs="; + }) (substituteAll { src = ./setup.patch; boost_version =