diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix new file mode 100644 index 000000000000..7d5f62c55aa2 --- /dev/null +++ b/pkgs/development/embedded/svdtools/default.nix @@ -0,0 +1,24 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "svdtools"; + version = "0.2.5"; + + src = fetchCrate { + inherit version pname; + sha256 = "sha256-tN1GC4tQXyaA8bgq7wB/NZEdO14p/0f8BXtgTk6aOzg="; + }; + + cargoSha256 = "sha256-puaveP9a11rlGgsguCfueYXfYSd7Xew8ZRGeDP8WrSI="; + + meta = with lib; { + description = "Tools to handle vendor-supplied, often buggy SVD files"; + homepage = "https://github.com/stm32-rs/svdtools"; + changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/svdtools/default.nix b/pkgs/development/python-modules/svdtools/default.nix deleted file mode 100644 index 21e6a143ce7e..000000000000 --- a/pkgs/development/python-modules/svdtools/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, braceexpand -, click -, pyyaml -, lxml -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "svdtools"; - version = "0.1.23"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit version pname; - hash = "sha256-LuursRuUZEDLbk9Wbnq/S0dsZHbzIJo1YCSVFMUoiog="; - }; - - propagatedBuildInputs = [ - braceexpand - click - pyyaml - lxml - ]; - - checkInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "svdtools" - ]; - - meta = with lib; { - description = "Python package to handle vendor-supplied, often buggy SVD files"; - homepage = "https://github.com/stm32-rs/svdtools"; - changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-python.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ newam ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45f27c13f7f6..f7f85b4b140c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14389,7 +14389,7 @@ with pkgs; svd2rust = callPackage ../development/tools/rust/svd2rust { }; - svdtools = with python3Packages; toPythonApplication svdtools; + svdtools = callPackage ../development/embedded/svdtools { }; swift = callPackage ../development/compilers/swift { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0ce1547508a..10ee4cadea0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10338,8 +10338,6 @@ in { suseapi = callPackage ../development/python-modules/suseapi { }; - svdtools = callPackage ../development/python-modules/svdtools { }; - svg2tikz = callPackage ../development/python-modules/svg2tikz { }; svglib = callPackage ../development/python-modules/svglib { };