From e9b906ef3490dc667f605684b85821c07a96ad26 Mon Sep 17 00:00:00 2001 From: Esteban Blanc Date: Mon, 26 Dec 2022 19:49:49 +0100 Subject: [PATCH] dt-schema: 2022.1 -> 2022.12 Co-authored-by: Bastien Germond --- .../development/python-modules/dtschema/default.nix | 11 +++++++++-- .../python-modules/dtschema/fix_libfdt_name.patch | 13 +++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/dtschema/fix_libfdt_name.patch diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index f2212d8c9c78..d6fcbccd3306 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -6,11 +6,12 @@ , rfc3987 , ruamel-yaml , setuptools-scm +, libfdt }: buildPythonPackage rec { pname = "dtschema"; - version = "2022.01"; + version = "2022.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,9 +20,14 @@ buildPythonPackage rec { owner = "devicetree-org"; repo = "dt-schema"; rev = "refs/tags/v${version}"; - hash = "sha256-wwlXIM/eO3dII/qQpkAGLT3/15rBLi7ZiNtqYFf7Li4="; + sha256 = "sha256-+wF6WdonZrkZEnlq/P6QeT3X7CMinxbapLa7q0t2zUc="; }; + patches = [ + # Change name of pylibfdt to libfdt + ./fix_libfdt_name.patch + ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ @@ -32,6 +38,7 @@ buildPythonPackage rec { jsonschema rfc3987 ruamel-yaml + libfdt ]; # Module has no tests diff --git a/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch b/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch new file mode 100644 index 000000000000..eb1ec34a95d6 --- /dev/null +++ b/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 62db8af..4a980c1 100755 +--- a/setup.py ++++ b/setup.py +@@ -52,7 +52,7 @@ setuptools.setup( + 'ruamel.yaml>0.15.69', + 'jsonschema>=4.1.2', + 'rfc3987', +- 'pylibfdt', ++ 'libfdt', + ], + + classifiers=[