sb10q
/
noptica-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell.nix: cleanup, update nmigen

master
Sebastien Bourdeauducq 2019-10-16 13:02:51 +08:00
parent c984c0b05d
commit e4bad186dc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shell.nix
View File

@ -17,17 +17,17 @@ let
python setup.py build_ext python setup.py build_ext
''; '';
}; };
nmigen = pkgs.python3Packages.buildPythonPackage { nmigen = pkgs.python3Packages.buildPythonPackage rec {
name = "nmigen"; name = "nmigen";
version = "2019-10-06"; version = "0.1rc1";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://github.com/m-labs/nmigen"; url = "https://github.com/m-labs/nmigen";
rev = "2512a9a12d2c062b8f34330c379ec523b125f38d"; rev = "v${version}";
sha256 = "0mi2snd8daabdmcbmc10hxzjmnmx85rnx1njqmrj1ll2jin3ncq7"; sha256 = "002kyxazpc2azarfzahr17imizs0m9m5silggzx8yyy1kljxl796";
leaveDotGit = true; leaveDotGit = true;
}; };
checkPhase = "PATH=${pkgs.yosys}/bin:${pkgs.symbiyosys}/bin:${pkgs.yices}/bin:$PATH python -m unittest discover nmigen.test -v"; checkPhase = "PATH=${pkgs.yosys}/bin:${pkgs.symbiyosys}/bin:${pkgs.yices}/bin:$PATH python -m unittest discover nmigen.test -v";
nativeBuildInputs = with pkgs; [ pkgs.python3Packages.setuptools_scm git ]; nativeBuildInputs = with pkgs; [ python3Packages.setuptools_scm git ];
propagatedBuildInputs = with pkgs.python3Packages; [ bitarray pyvcd jinja2 ]; propagatedBuildInputs = with pkgs.python3Packages; [ bitarray pyvcd jinja2 ];
}; };
glasgow = pkgs.python3Packages.buildPythonApplication rec { glasgow = pkgs.python3Packages.buildPythonApplication rec {
@ -36,12 +36,12 @@ let
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://github.com/GlasgowEmbedded/Glasgow"; url = "https://github.com/GlasgowEmbedded/Glasgow";
rev = "bfe49bebc4483b32eed8ec127a98a9fa2e77e7d4"; rev = "bfe49bebc4483b32eed8ec127a98a9fa2e77e7d4";
sha256 = "0wvn7ysixgxm35ghdp0cdqfp5pxpbxvr1r9d5amcz3ss6bd2844c"; sha256 = "0sh7l57pr49mmiqxq6g12pcln9h474gvlkfh3c439aqiv3p3jvyl";
fetchSubmodules = true; fetchSubmodules = true;
leaveDotGit = true; leaveDotGit = true;
}; };
patches = [ ./glasgow-applet.diff ]; patches = [ ./glasgow-applet.diff ];
nativeBuildInputs = with pkgs; [ pkgs.python3Packages.setuptools_scm git gnumake sdcc ]; nativeBuildInputs = with pkgs; [ python3Packages.setuptools_scm git gnumake sdcc ];
propagatedBuildInputs = ( propagatedBuildInputs = (
[ fx2 nmigen ] ++ [ fx2 nmigen ] ++
(with pkgs.python3Packages; [ setuptools libusb1 aiohttp pyvcd bitarray crcmod ]) ++ (with pkgs.python3Packages; [ setuptools libusb1 aiohttp pyvcd bitarray crcmod ]) ++