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

glasgow: unstable-2019-10-16 -> unstable-2020-02-08

Browse Source
This commit is contained in:
Emily 2020-02-08 21:43:04 +00:00 committed by Austin Seipp
parent 867b31d5e1
commit d6640aac70
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/glasgow/default.nix
View File

@ -18,15 +18,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "glasgow"; pname = "glasgow";
version = "unstable-2019-10-16"; version = "unstable-2020-02-08";
# python software/setup.py --version # python software/setup.py --version
realVersion = "0.1.dev1286+g${lib.substring 0 7 src.rev}"; realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GlasgowEmbedded"; owner = "GlasgowEmbedded";
repo = "glasgow"; repo = "glasgow";
rev = "4f968dbe6cf4e9d8e2d0a5163d82e996c24d5e30"; rev = "2a8bfc981b90ba5d86c310911dbd6ffe71acd498";
sha256 = "1b50n12dc0b3jmim5ywg7daq62k5j4wkgmwzk88ric5ri3b8dl2r"; sha256 = "01v5269bv09ggvmq6lqyhr5am51hzmwya1p5n62h84b7rdwd8q9m";
}; };
nativeBuildInputs = [ setuptools_scm sdcc ]; nativeBuildInputs = [ setuptools_scm sdcc ];
@ -44,6 +44,8 @@ buildPythonPackage rec {
checkInputs = [ yosys icestorm nextpnr ]; checkInputs = [ yosys icestorm nextpnr ];
enableParallelBuilding = true;
preBuild = '' preBuild = ''
make -C firmware LIBFX2=${fx2}/share/libfx2 make -C firmware LIBFX2=${fx2}/share/libfx2
cp firmware/glasgow.ihex software/glasgow cp firmware/glasgow.ihex software/glasgow
@ -55,7 +57,7 @@ buildPythonPackage rec {
doInstallCheck = false; doInstallCheck = false;
checkPhase = '' checkPhase = ''
python -m unittest discover python -W ignore::DeprecationWarning test.py
''; '';
makeWrapperArgs = [ makeWrapperArgs = [