From 71bdc1e8940231a61d35f75ab7bfb5e6bf21e4f7 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 18 Jan 2026 05:04:41 +0100
Subject: [PATCH 1/4] python313Packages.dtschema: 2025.08 -> 2025.12

---
 .../python-modules/dtschema/default.nix            | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix
index eddcadc8dd56..56b28a5ac4f4 100644
--- a/pkgs/development/python-modules/dtschema/default.nix
+++ b/pkgs/development/python-modules/dtschema/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "dtschema";
-  version = "2025.08";
+  version = "2025.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "devicetree-org";
     repo = "dt-schema";
     tag = "v${version}";
-    sha256 = "sha256-SW2WAVB7ZSgKRjIyFdMqe8tRIuM97ZVBg4d0BJC6SBI=";
+    sha256 = "sha256-DCkZDI0/W/4IkMzaa769vKJxlSMWoEsLIdlyChYd+Mk=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
@@ -46,13 +46,7 @@ buildPythonPackage rec {
     ];
     maintainers = with lib.maintainers; [ sorki ];
 
-    broken = (
-      # Library not loaded: @rpath/libfdt.1.dylib
-      stdenv.hostPlatform.isDarwin
-      ||
-
-        # see https://github.com/devicetree-org/dt-schema/issues/108
-        lib.versionAtLeast jsonschema.version "4.18"
-    );
+    # Library not loaded: @rpath/libfdt.1.dylib
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From f93c2cedfecb677bb644f0b8c63004f9d164a2d9 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 18 Jan 2026 05:04:58 +0100
Subject: [PATCH 2/4] dt-schema: remove python override

---
 pkgs/by-name/dt/dt-schema/package.nix | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/dt/dt-schema/package.nix b/pkgs/by-name/dt/dt-schema/package.nix
index 6aacd1306435..3cffc72ca6fe 100644
--- a/pkgs/by-name/dt/dt-schema/package.nix
+++ b/pkgs/by-name/dt/dt-schema/package.nix
@@ -1,26 +1,5 @@
 {
-  python3,
+  python3Packages,
 }:
 
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      # see https://github.com/devicetree-org/dt-schema/issues/108
-      jsonschema = super.jsonschema.overridePythonAttrs (old: rec {
-        version = "4.17.3";
-
-        src = old.src.override {
-          inherit version;
-          hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0=";
-        };
-
-        propagatedBuildInputs = with self; [
-          attrs
-          pyrsistent
-        ];
-      });
-    };
-  };
-in
-python.pkgs.toPythonApplication python.pkgs.dtschema
+python3Packages.toPythonApplication python3Packages.dtschema

From d7c774fcf728dd6156a17f7cb49f2dd44fdd9de2 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 18 Jan 2026 05:08:20 +0100
Subject: [PATCH 3/4] python313Packages.dtschema: enable tests

---
 pkgs/development/python-modules/dtschema/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix
index 56b28a5ac4f4..1cd18560ac39 100644
--- a/pkgs/development/python-modules/dtschema/default.nix
+++ b/pkgs/development/python-modules/dtschema/default.nix
@@ -8,6 +8,8 @@
   ruamel-yaml,
   setuptools-scm,
   libfdt,
+  pytestCheckHook,
+  dtc,
 }:
 
 buildPythonPackage rec {
@@ -31,11 +33,15 @@ buildPythonPackage rec {
     libfdt
   ];
 
-  # Module has no tests
-  doCheck = false;
-
   pythonImportsCheck = [ "dtschema" ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    dtc
+  ];
+
+  enabledTestPaths = [ "test/test-dt-validate.py" ];
+
   meta = {
     description = "Tooling for devicetree validation using YAML and jsonschema";
     homepage = "https://github.com/devicetree-org/dt-schema/";

From 5130c5d16ebeb1441423cb3399c8f885dd2fcfc0 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 18 Jan 2026 05:09:46 +0100
Subject: [PATCH 4/4] python313Packages.dtschema: modernize

---
 .../python-modules/dtschema/default.nix            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix
index 1cd18560ac39..a4a3037ad2cb 100644
--- a/pkgs/development/python-modules/dtschema/default.nix
+++ b/pkgs/development/python-modules/dtschema/default.nix
@@ -12,7 +12,7 @@
   dtc,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dtschema";
   version = "2025.12";
   pyproject = true;
@@ -20,13 +20,13 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "devicetree-org";
     repo = "dt-schema";
-    tag = "v${version}";
-    sha256 = "sha256-DCkZDI0/W/4IkMzaa769vKJxlSMWoEsLIdlyChYd+Mk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DCkZDI0/W/4IkMzaa769vKJxlSMWoEsLIdlyChYd+Mk=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jsonschema
     rfc3987
     ruamel-yaml
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   meta = {
     description = "Tooling for devicetree validation using YAML and jsonschema";
     homepage = "https://github.com/devicetree-org/dt-schema/";
-    changelog = "https://github.com/devicetree-org/dt-schema/releases/tag/v${version}";
+    changelog = "https://github.com/devicetree-org/dt-schema/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       bsd2 # or
       gpl2Only
@@ -55,4 +55,4 @@ buildPythonPackage rec {
     # Library not loaded: @rpath/libfdt.1.dylib
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})