diff --git a/pkgs/development/python-modules/peakrdl-cheader/default.nix b/pkgs/development/python-modules/peakrdl-cheader/default.nix index 1bef65a58fee..c7e605089f63 100644 --- a/pkgs/development/python-modules/peakrdl-cheader/default.nix +++ b/pkgs/development/python-modules/peakrdl-cheader/default.nix @@ -4,7 +4,6 @@ gitUpdater, jinja2, lib, - peakrdl, setuptools, setuptools-scm, systemrdl-compiler, @@ -30,7 +29,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ jinja2 - peakrdl systemrdl-compiler ]; diff --git a/pkgs/development/python-modules/peakrdl/default.nix b/pkgs/development/python-modules/peakrdl-cli/default.nix similarity index 83% rename from pkgs/development/python-modules/peakrdl/default.nix rename to pkgs/development/python-modules/peakrdl-cli/default.nix index afa16f433a2b..112089c410d8 100644 --- a/pkgs/development/python-modules/peakrdl/default.nix +++ b/pkgs/development/python-modules/peakrdl-cli/default.nix @@ -9,8 +9,8 @@ typing-extensions, }: -buildPythonPackage rec { - pname = "peakrdl"; +buildPythonPackage (finalAttrs: { + pname = "peakrdl-cli"; version = "1.5.0"; pyproject = true; @@ -18,10 +18,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SystemRDL"; repo = "PeakRDL"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SqLhOzx0gUVG8k4ikNbx8p1vO/ZqTQ/KAtidRWM2SZI="; }; - sourceRoot = "${src.name}/peakrdl-cli"; + sourceRoot = "${finalAttrs.src.name}/peakrdl-cli"; build-system = [ setuptools @@ -42,4 +42,4 @@ buildPythonPackage rec { maintainers = [ lib.maintainers.jmbaur ]; mainProgram = "peakrdl"; }; -} +}) diff --git a/pkgs/development/python-modules/peakrdl-ipxact/default.nix b/pkgs/development/python-modules/peakrdl-ipxact/default.nix index f8fdd217bc75..adfe6e5d89b8 100644 --- a/pkgs/development/python-modules/peakrdl-ipxact/default.nix +++ b/pkgs/development/python-modules/peakrdl-ipxact/default.nix @@ -3,13 +3,12 @@ fetchFromGitHub, gitUpdater, lib, - peakrdl, setuptools, setuptools-scm, systemrdl-compiler, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "peakrdl-ipxact"; version = "3.5.0"; @@ -18,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SystemRDL"; repo = "PeakRDL-ipxact"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GFHgIyK82dt+/t0XbDdk61q0DXUOabxtjlhZhgacUVA="; }; @@ -27,10 +26,7 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ - peakrdl - systemrdl-compiler - ]; + dependencies = [ systemrdl-compiler ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; @@ -40,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.jmbaur ]; }; -} +}) diff --git a/pkgs/development/python-modules/peakrdl-markdown/default.nix b/pkgs/development/python-modules/peakrdl-markdown/default.nix index eb59158f6ad8..3e5898da75b1 100644 --- a/pkgs/development/python-modules/peakrdl-markdown/default.nix +++ b/pkgs/development/python-modules/peakrdl-markdown/default.nix @@ -3,12 +3,13 @@ fetchFromGitHub, gitUpdater, lib, - peakrdl, - py-markdown-table, + peakrdl-cli, poetry-core, + py-markdown-table, + systemrdl-compiler, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "peakrdl-markdown"; version = "1.0.3"; @@ -17,15 +18,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SystemRDL"; repo = "PeakRDL-markdown"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Dt8FxnvvXY9nVhFehIcfSC9mFbbEzEuaVnBMu032dug="; }; build-system = [ poetry-core ]; dependencies = [ - peakrdl + peakrdl-cli py-markdown-table + systemrdl-compiler ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; @@ -36,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.jmbaur ]; }; -} +}) diff --git a/pkgs/development/python-modules/peakrdl-regblock/default.nix b/pkgs/development/python-modules/peakrdl-regblock/default.nix index 040c768fc1db..bc83640a9a3d 100644 --- a/pkgs/development/python-modules/peakrdl-regblock/default.nix +++ b/pkgs/development/python-modules/peakrdl-regblock/default.nix @@ -4,13 +4,12 @@ gitUpdater, jinja2, lib, - peakrdl, setuptools, setuptools-scm, systemrdl-compiler, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "peakrdl-regblock"; version = "1.3.1"; @@ -19,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SystemRDL"; repo = "PeakRDL-regblock"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UyDM8+hnZP5G9JqprBjVaL1kr5NyJXITaBVCfNEs2Cs="; }; @@ -30,7 +29,6 @@ buildPythonPackage rec { dependencies = [ jinja2 - peakrdl systemrdl-compiler ]; @@ -42,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.jmbaur ]; }; -} +}) diff --git a/pkgs/development/python-modules/peakrdl-rust/default.nix b/pkgs/development/python-modules/peakrdl-rust/default.nix index a13ed8a20b49..31e0d933844f 100644 --- a/pkgs/development/python-modules/peakrdl-rust/default.nix +++ b/pkgs/development/python-modules/peakrdl-rust/default.nix @@ -4,12 +4,11 @@ fetchFromGitHub, jinja2, lib, - peakrdl, systemrdl-compiler, uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "peakrdl-rust"; version = "0.7.3"; @@ -18,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "darsor"; repo = "PeakRDL-rust"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1rdTz3w1SEDFWpTjKIk9eLgj3F09lDOMqqdUf8iDd7g="; }; @@ -27,7 +26,6 @@ buildPythonPackage rec { dependencies = [ case-converter jinja2 - peakrdl systemrdl-compiler ]; @@ -37,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl21Only; maintainers = [ lib.maintainers.jmbaur ]; }; -} +}) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 16df0610345a..e59d88ce3f66 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -417,6 +417,7 @@ mapAliases { pathpy = throw "'pathpy' has been renamed to/replaced by 'path'"; # Converted to throw 2025-10-29 pcbnew-transition = throw "'pcbnew-transition' has been renamed to/replaced by 'pcbnewtransition'"; # Converted to throw 2025-10-29 pdfminer = throw "'pdfminer' has been renamed to/replaced by 'pdfminer-six'"; # Converted to throw 2025-10-29 + peakrdl = throw "'peakrdl' has been renamed to/replaced by 'peakrdl-cli'"; # added 2026-07-14 pep257 = throw "'pep257' has been renamed to/replaced by 'pydocstyle'"; # Converted to throw 2025-10-29 percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25 pilight = throw "'pilight' has been removed, because it is unmaintained since 2019 and the integration was removed from Home Assistant."; # added 2026-05-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ccb3285fe6d..3694b06b8468 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12967,10 +12967,10 @@ self: super: with self; { peacasso = callPackage ../development/python-modules/peacasso { }; - peakrdl = callPackage ../development/python-modules/peakrdl { }; - peakrdl-cheader = callPackage ../development/python-modules/peakrdl-cheader { }; + peakrdl-cli = callPackage ../development/python-modules/peakrdl-cli { }; + peakrdl-ipxact = callPackage ../development/python-modules/peakrdl-ipxact { }; peakrdl-markdown = callPackage ../development/python-modules/peakrdl-markdown { };