diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index c4effc294787..096505a690d3 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -20,8 +20,9 @@ buildPythonPackage rec { pname = "amaranth"; - format = "pyproject"; version = "0.5.4"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { @@ -33,12 +34,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail \ - "pdm-backend~=2.3.0" \ - "pdm-backend>=2.3.0" + --replace-fail "pdm-backend~=2.3.0" "pdm-backend>=2.3.0" ''; nativeBuildInputs = [ git ]; + build-system = [ pdm-backend ]; dependencies = @@ -59,14 +59,28 @@ buildPythonPackage rec { pythonImportsCheck = [ "amaranth" ]; + disabledTests = [ + "verilog" + "test_reversible" + "test_distance" + ]; + + disabledTestPaths = [ + # Subprocesses + "tests/test_examples.py" + # Verification failures + "tests/test_lib_fifo.py" + ]; + meta = with lib; { description = "Modern hardware definition language and toolchain based on Python"; - mainProgram = "amaranth-rpc"; homepage = "https://amaranth-lang.org/docs/amaranth"; + changelog = "https://github.com/amaranth-lang/amaranth/blob/v${version}/docs/changes.rst"; license = licenses.bsd2; maintainers = with maintainers; [ thoughtpolice pbsds ]; + mainProgram = "amaranth-rpc"; }; } diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 702c8cd453f3..e2e1d2a0342b 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.5.0"; + version = "4.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sissaschool"; repo = "elementpath"; tag = "v${version}"; - hash = "sha256-zyJ+UtPTGEziIlucIXN1dIzfN5sfLkeOia7tiqOGFjk="; + hash = "sha256-lFUrY3LOSc2OROkzotGSW9N3h9dJA4EnCvLNU41BPA0="; }; build-system = [ setuptools ];