From 3239d056982878a82e503a9b48eb33b93056ae1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 16:03:47 +0100 Subject: [PATCH 1/6] dt-schema: move to python-modules --- .../{tools/dt-schema => python-modules/dtschema}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/development/{tools/dt-schema => python-modules/dtschema}/default.nix (100%) diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/python-modules/dtschema/default.nix similarity index 100% rename from pkgs/development/tools/dt-schema/default.nix rename to pkgs/development/python-modules/dtschema/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..8389b8f0249c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6761,7 +6761,7 @@ with pkgs; dtc = callPackage ../development/compilers/dtc { }; - dt-schema = python3Packages.callPackage ../development/tools/dt-schema { }; + dt-schema = with python3Packages; toPythonApplication dtschema; dub = callPackage ../development/tools/build-managers/dub { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ac6c38143bb..c53230e62fc5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2898,6 +2898,8 @@ self: super: with self; { dtlssocket = callPackage ../development/python-modules/dtlssocket { }; + dtschema = callPackage ../development/python-modules/dtschema { }; + ducc0 = callPackage ../development/python-modules/ducc0 { }; duckdb = callPackage ../development/python-modules/duckdb { From 76f91af215e34f494758a6ccf5d7bb2d4c1716be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 16:05:27 +0100 Subject: [PATCH 2/6] python310Packages.dtschema: update license --- pkgs/development/python-modules/dtschema/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index 20e1ed136e2b..e76f98c08abd 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -29,8 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tooling for devicetree validation using YAML and jsonschema"; homepage = "https://github.com/devicetree-org/dt-schema/"; - # all files have SPDX tags - license = with licenses; [ bsd2 gpl2 ]; + license = with licenses; [ bsd2 /* or */ gpl2Only ]; maintainers = with maintainers; [ sorki ]; }; } From 7f7b1782842ca88c75a0ea3e216ed239c1f3f8ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 16:06:03 +0100 Subject: [PATCH 3/6] python310Packages.dtschema: disable on unsupported Python releases --- pkgs/development/python-modules/dtschema/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index e76f98c08abd..c8a044a54f5c 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -12,6 +12,9 @@ buildPythonPackage rec { pname = "dtschema"; version = "2022.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From b1c19e1bf53f848eab0c2192281726cca78a497c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 16:06:39 +0100 Subject: [PATCH 4/6] python310Packages.dtschema: add changelog to meta --- pkgs/development/python-modules/dtschema/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index c8a044a54f5c..377c315d9d92 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { 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}"; license = with licenses; [ bsd2 /* or */ gpl2Only ]; maintainers = with maintainers; [ sorki ]; }; From 78409f3c62fa8cbe4b8bb70859f832972201751f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 16:07:20 +0100 Subject: [PATCH 5/6] python310Packages.dtschema: add pythonImportsCheck --- pkgs/development/python-modules/dtschema/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index 377c315d9d92..cb043872a82c 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -29,6 +29,10 @@ buildPythonPackage rec { rfc3987 ]; + pythonImportsCheck = [ + "dtschema" + ]; + meta = with lib; { description = "Tooling for devicetree validation using YAML and jsonschema"; homepage = "https://github.com/devicetree-org/dt-schema/"; From 046c0a144709a70d0dba1c4e455f18250c4b4342 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 16:48:28 +0100 Subject: [PATCH 6/6] python310Packages.dtschema: modernize --- .../python-modules/dtschema/default.nix | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index cb043872a82c..f2212d8c9c78 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -1,34 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, git -, ruamel-yaml +, fetchFromGitHub , jsonschema +, pythonOlder , rfc3987 -, setuptools +, ruamel-yaml , setuptools-scm }: buildPythonPackage rec { pname = "dtschema"; - version = "2022.1"; + version = "2022.01"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-G5KzuaMbbkuLK+cNvzBld1UwvExS6ZGVW2e+GXQRFMU="; + src = fetchFromGitHub { + owner = "devicetree-org"; + repo = "dt-schema"; + rev = "refs/tags/v${version}"; + hash = "sha256-wwlXIM/eO3dII/qQpkAGLT3/15rBLi7ZiNtqYFf7Li4="; }; - nativeBuildInputs = [ setuptools-scm git ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ - setuptools - ruamel-yaml jsonschema rfc3987 + ruamel-yaml ]; + # Module has no tests + doCheck = false; + pythonImportsCheck = [ "dtschema" ];