Compare commits

...

3 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 92671d534c nmigen-boards: add 2019-06-11 22:53:03 +08:00
Sebastien Bourdeauducq 6d837f4662 nmigen: bump 2019-06-11 22:52:43 +08:00
Sebastien Bourdeauducq 6d2449b973 nmigen: fix URL 2019-06-11 22:47:38 +08:00
3 changed files with 25 additions and 3 deletions

View File

@ -4,6 +4,7 @@ rec {
yosys = pkgs.callPackage ./eda/yosys.nix {}; yosys = pkgs.callPackage ./eda/yosys.nix {};
symbiyosys = pkgs.symbiyosys.override { inherit yosys; }; symbiyosys = pkgs.symbiyosys.override { inherit yosys; };
nmigen = pkgs.callPackage ./eda/nmigen.nix { inherit yosys; }; nmigen = pkgs.callPackage ./eda/nmigen.nix { inherit yosys; };
nmigen-boards = pkgs.callPackage ./eda/nmigen-boards.nix { inherit nmigen; };
scala-spinalhdl = pkgs.callPackage ./eda/scala-spinalhdl.nix {}; scala-spinalhdl = pkgs.callPackage ./eda/scala-spinalhdl.nix {};
jtagtap = pkgs.callPackage ./cores/jtagtap.nix { inherit nmigen; }; jtagtap = pkgs.callPackage ./cores/jtagtap.nix { inherit nmigen; };

21
eda/nmigen-boards.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchFromGitHub, python3Packages, nmigen }:
python3Packages.buildPythonPackage {
name = "nmigen-boards";
src = fetchFromGitHub {
owner = "m-labs";
repo = "nmigen-boards";
rev = "bb52dfb9575c4aabf8e7dd9ddd780bf342ee0a71";
sha256 = "1zmr57nvjz23srgx0yi4lc9rx856rypvi139202qc195almap168";
};
propagatedBuildInputs = [ nmigen ];
meta = with stdenv.lib; {
description = "Board and connector definition files for nMigen";
homepage = "https://m-labs.hk";
license = licenses.bsd2;
maintainers = [ maintainers.sb0 ];
};
}

View File

@ -6,8 +6,8 @@ python3Packages.buildPythonPackage {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "m-labs"; owner = "m-labs";
repo = "nmigen"; repo = "nmigen";
rev = "b45c5119f573e156a3aad4a362ca210d6e40505e"; rev = "ad1a40c934cc33374109069296386d66023671f1";
sha256 = "1qyh6h8amqz9z6l2h0rj4lzpkm1i2fgbxn5m0p6igwflqk0svffz"; sha256 = "0r1agrx7z38yzsi6cnxrdv3isbcsvmpkcp0lfxg426l9r52xg4r5";
}; };
checkPhase = "PATH=${yosys}/bin:${symbiyosys}/bin:${yices}/bin:$PATH python -m unittest discover nmigen.test -v"; checkPhase = "PATH=${yosys}/bin:${symbiyosys}/bin:${yices}/bin:$PATH python -m unittest discover nmigen.test -v";
@ -16,7 +16,7 @@ python3Packages.buildPythonPackage {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A refreshed Python toolbox for building complex digital hardware"; description = "A refreshed Python toolbox for building complex digital hardware";
homepage = "https://lambdaconcept.com"; homepage = "https://m-labs.hk";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = [ maintainers.sb0 ]; maintainers = [ maintainers.sb0 ];
}; };