From 6762e6e33e7a2d57f57f447a0722600b6001304f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 08:25:57 +0100 Subject: [PATCH 1/3] python312Packages.elementpath: 4.5.0 -> 4.6.0 Diff: https://github.com/sissaschool/elementpath/compare/refs/tags/v4.5.0...v4.6.0 Changelog: https://github.com/sissaschool/elementpath/blob/v4.6.0/CHANGELOG.rst --- pkgs/development/python-modules/elementpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 702c8cd453f3..f07fa7004e24 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.5.0"; + version = "4.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; tag = "v${version}"; - hash = "sha256-zyJ+UtPTGEziIlucIXN1dIzfN5sfLkeOia7tiqOGFjk="; + hash = "sha256-lFUrY3LOSc2OROkzotGSW9N3h9dJA4EnCvLNU41BPA0="; }; build-system = [ setuptools ]; From 5ef0268f7ff514fcba39560c1ef5be7836ff7392 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 08:26:56 +0100 Subject: [PATCH 2/3] python312Packages.elementpath: update disabled --- pkgs/development/python-modules/elementpath/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index f07fa7004e24..e2e1d2a0342b 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { version = "4.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sissaschool"; From 589a387a44411609edcdaf42eb382148b4acb8cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 21:25:52 +0100 Subject: [PATCH 3/3] python312Packages.amaranth: disable failing tests --- .../python-modules/amaranth/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) 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"; }; }