M-Labs
/
HeavyX
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: M-Labs:92671d534c458e4ecb5505780e4d24962ca8414c
Branches Tags
M-Labs:master
M-Labs:core_lib
..
compare: M-Labs:b93ee35a7d22ecc4f605557882cc7ba095183052
Branches Tags
M-Labs:core_lib
M-Labs:master

No commits in common. "92671d534c458e4ecb5505780e4d24962ca8414c" and "b93ee35a7d22ecc4f605557882cc7ba095183052" have entirely different histories.
92671d534c ... b93ee35a7d

3 changed files with 3 additions and 25 deletions
Show Stats Expand all files Collapse all files

1
default.nix
View File

@ -4,7 +4,6 @@ rec {
yosys = pkgs.callPackage ./eda/yosys.nix {};
symbiyosys = pkgs.symbiyosys.override { 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 {};
jtagtap = pkgs.callPackage ./cores/jtagtap.nix { inherit nmigen; };

21
eda/nmigen-boards.nix
View File

@ -1,21 +0,0 @@
{ 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 ];
};
}

6
eda/nmigen.nix
View File

@ -6,8 +6,8 @@ python3Packages.buildPythonPackage {
src = fetchFromGitHub {
owner = "m-labs";
repo = "nmigen";
rev = "ad1a40c934cc33374109069296386d66023671f1";
sha256 = "0r1agrx7z38yzsi6cnxrdv3isbcsvmpkcp0lfxg426l9r52xg4r5";
rev = "b45c5119f573e156a3aad4a362ca210d6e40505e";
sha256 = "1qyh6h8amqz9z6l2h0rj4lzpkm1i2fgbxn5m0p6igwflqk0svffz";
};
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; {
description = "A refreshed Python toolbox for building complex digital hardware";
homepage = "https://m-labs.hk";
homepage = "https://lambdaconcept.com";
license = licenses.bsd2;
maintainers = [ maintainers.sb0 ];
};