JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112614 from danderson/danderson/nmigen-update

Browse Source 
nmigen: update to current git HEAD
This commit is contained in:
Austin Seipp 2021-02-11 02:58:16 -06:00 committed by GitHub
commit 4f6ca4d5a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/science/logic/symbiyosys/default.nix
View File

@ -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";

8
pkgs/development/python-modules/nmigen-boards/default.nix
View File

@ -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 ];

8
pkgs/development/python-modules/nmigen-soc/default.nix
View File

@ -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 ];

25
pkgs/development/python-modules/nmigen/default.nix
View File

@ -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";