diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/nmigen/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/nmigen/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/nmigen/default.nix b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix index 4a2327bf9288..1e38a087bce4 100644 --- a/nixpkgs/pkgs/development/python-modules/nmigen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix @@ -6,6 +6,8 @@ , setuptools_scm , pyvcd , jinja2 +, importlib-resources +, importlib-metadata # for tests , pytestCheckHook @@ -16,21 +18,27 @@ buildPythonPackage rec { pname = "nmigen"; - version = "unstable-2020-04-02"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}"; + realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen"; - rev = "c79caead33fff14e2dec42b7e21d571a02526876"; - sha256 = "sha256-3+mxHyg0a92/BfyePtKT5Hsk+ra+fQzTjCJ2Ech44/s="; + rev = "f7c2b9419f9de450be76a0e9cf681931295df65f"; + sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1"; }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ setuptools pyvcd jinja2 ]; + propagatedBuildInputs = [ + setuptools + pyvcd + jinja2 + ] ++ + lib.optional (pythonOlder "3.9") importlib-resources ++ + lib.optional (pythonOlder "3.8") importlib-metadata; checkInputs = [ pytestCheckHook yosys symbiyosys yices ]; @@ -38,13 +46,6 @@ buildPythonPackage rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; - # Fail b/c can't find sby (symbiyosys) executable, which should be on path. - disabledTests = [ - "test_distance" - "test_reversible" - "FIFOFormalCase" - ]; - meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; homepage = "https://nmigen.info/nmigen"; |