diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index a010d3570b7c..cfd76b23a8ad 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -3,38 +3,36 @@ buildPythonPackage, fetchFromGitHub, amaranth, - setuptools, - setuptools-scm, + pdm-backend, unstableGitUpdater, }: buildPythonPackage rec { pname = "amaranth-boards"; - version = "0-unstable-2024-05-01"; + version = "0-unstable-2024-10-18"; pyproject = true; - # python setup.py --version - realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}"; + # from `pdm show` + realVersion = + let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in + "${tag}1.dev1+g${rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-boards"; - rev = "aba2300dc83216523e1c98fdb22471cb4bac5027"; + rev = "23c66d68045831de0a372c8c237274d74c71ef4e"; # these files change depending on git branch status postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes"; - hash = "sha256-jldXyMJtuSGcZKmtwpZBYrR/UBe4ufblPYRYpBmReM8="; + hash = "sha256-cC7uvj9+6h3RPbFdu3/T1t/jhw5CuLOF8aKwDSkRE54="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; - dependencies = [ - setuptools - amaranth - ]; + build-system = [ pdm-backend ]; + dependencies = [ amaranth ]; preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" + export PDM_BUILD_SCM_VERSION="${realVersion}" ''; # no tests diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 597a1829161f..a33128a376d1 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,22 +9,24 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2024-06-10"; + version = "0.1a-unstable-2024-10-12"; pyproject = true; # from `pdm show` - realVersion = let - tag = builtins.elemAt (lib.splitString "-" version) 0; - rev = lib.substring 0 7 src.rev; - in "${tag}1.dev1+g${rev}"; + realVersion = + let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in + "${tag}1.dev1+g${rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "e1b842800533f44924f21c3867bc2290084d100f"; - hash = "sha256-GAGQEncONY566v8hLjGeZ7CRlOt36vHg+0a5xcB+g1Y="; + rev = "5c43cf58f15d9cd9c69ff83c97997708d386b2dc"; + hash = "sha256-o9xjH/nmV7ovw6bQ6PaFGLcjz5gDGb+eQ9eGNRPnBV8="; }; - nativeBuildInputs = [ pdm-backend ]; + build-system = [ pdm-backend ]; dependencies = [ amaranth ]; preBuild = '' diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index bac25d70f040..e79be265ba46 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -21,20 +21,18 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; rev = "refs/tags/v${version}"; - hash = "sha256-pf9X1B60FgqTbSw7D80ERHp4GCvCe5lqrlS96xPXLNo="; + hash = "sha256-lPQw7fAVM7URdyC/9c/UIYsRxVXrLjvHODvhYBdlkkg="; }; - nativeBuildInputs = [ - git - pdm-backend - ]; + nativeBuildInputs = [ git ]; + build-system = [ pdm-backend ]; dependencies = [