From 6f1319a4d6dac91cc91b77a149828cd0989e0144 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 9 Feb 2021 20:54:58 -0800 Subject: [PATCH 1/4] symbiyosys: fix the interpreter of the `sby` binary. Signed-off-by: David Anderson --- pkgs/applications/science/logic/symbiyosys/default.nix | 3 +++ pkgs/development/python-modules/nmigen/default.nix | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 1f2ad4634de..118bb8ecd20 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation { substituteInPlace sbysrc/sby_core.py \ --replace '##yosys-program-prefix##' '"${yosys}/bin/"' + + substituteInPlace sbysrc/sby.py \ + --replace '/usr/bin/env python3' '${python3}/bin/python' ''; buildPhase = "true"; diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 4a2327bf928..ca898b988c7 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -38,13 +38,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"; From 6a865bf06096c423156eab9d64749333eb62fe0e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 9 Feb 2021 20:47:21 -0800 Subject: [PATCH 2/4] nmigen: 2020-04-02 -> 2021-02-09 Signed-off-by: David Anderson --- .../python-modules/nmigen/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index ca898b988c7..1e38a087bce 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/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 ]; From 4785251626d1d9eead49ed5187adc5f6d7b3da8f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 9 Feb 2021 20:48:09 -0800 Subject: [PATCH 3/4] nmigen-boards: 2020-02-06 -> 2021-02-09 Signed-off-by: David Anderson --- pkgs/development/python-modules/nmigen-boards/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix index 55f70f74db9..f397454e7e1 100644 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "nmigen-boards"; - version = "unstable-2020-02-06"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.1.dev92+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev173+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen-boards"; - rev = "f37fe0295035db5f1bf82ed086b2eb349ab3a530"; - sha256 = "16112ahil100anfwggj64nyrj3pf7mngwrjyqyhf2ggxx9ir24cc"; + rev = "a35d870a994c2919116b2c06166dc127febb1512"; + sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf"; }; nativeBuildInputs = [ setuptools_scm ]; From 08a70a12e7615b2c801227a8d6070821cbbe512e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 9 Feb 2021 20:48:29 -0800 Subject: [PATCH 4/4] nmigen-soc: 2020-02-08 -> 2021-02-09 Signed-off-by: David Anderson --- pkgs/development/python-modules/nmigen-soc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix index afc0c63a38f..b987557d5f6 100644 --- a/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/pkgs/development/python-modules/nmigen-soc/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "nmigen-soc"; - version = "unstable-2020-02-08"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.1.dev24+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev43+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen-soc"; - rev = "f5b5cd563e8e8d081b0535c4554c02b5456ee8b4"; - sha256 = "04kjaq9qp6ac3h0r1wlb4jyz56bb52l1rikmz1x7azvnr10xhrad"; + rev = "ecfad4d9abacf903a525f0a252c38844eda0d2dd"; + sha256 = "0afmnfs1ms7p1r4c1nc0sfvlcq36zjwaim7775v5i2vajcn3020c"; }; nativeBuildInputs = [ setuptools_scm ];