From 4be3eb812b7c4deb569cce4ac25a4d8e37b6b76a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 9 May 2025 00:22:16 +0200 Subject: [PATCH 1/2] python313Packages.pyocd: fetch from github --- pkgs/development/python-modules/pyocd/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index bb10f1881118..4f5591e615c3 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, fetchpatch, capstone_4, cmsis-pack-manager, @@ -29,9 +29,11 @@ buildPythonPackage rec { version = "0.36.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-k3eCrMna/wVNUPt8b3iM2UqE+A8LhfJarKuZ3Jgihkg="; + src = fetchFromGitHub { + owner = "pyocd"; + repo = "pyOCD"; + tag = "v${version}"; + hash = "sha256-CSdVWDiSe+xd0MzD9tsKs3DklNjnhchYFuI3Udi0O20="; }; patches = [ From a67e736b164d22e3a944bd483e45e4b6d2bc9cd5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 9 May 2025 00:37:57 +0200 Subject: [PATCH 2/2] python313Packages.pyocd: relax and upgrade capstone --- pkgs/development/python-modules/pyocd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index 4f5591e615c3..65d7342f9edf 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - capstone_4, + capstone, cmsis-pack-manager, colorama, importlib-metadata, @@ -38,6 +38,7 @@ buildPythonPackage rec { patches = [ # https://github.com/pyocd/pyOCD/pull/1332 + # merged into develop (fetchpatch { name = "libusb-package-optional.patch"; url = "https://github.com/pyocd/pyOCD/commit/0b980cf253e3714dd2eaf0bddeb7172d14089649.patch"; @@ -45,12 +46,13 @@ buildPythonPackage rec { }) ]; + pythonRelaxDeps = [ "capstone" ]; pythonRemoveDeps = [ "libusb-package" ]; build-system = [ setuptools-scm ]; dependencies = [ - capstone_4 + capstone cmsis-pack-manager colorama importlib-metadata