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

cocotb: 1.2.0 -> 1.3.0

Browse Source 
The fix for the CC/CXX variables was merged some time before 1.3.0.

The `-Werror` seems to be new. It is removed in upstream's master so it
should be removable in the next release. Something in glibc is causing a
warning that is killing the build if `-Werror` isn't removed.
This commit is contained in:
Jennifer Wilcox 2020-02-29 18:11:49 -06:00 committed by Jon
parent ecf79a07e1
commit bebcf42905
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cocotb"; pname = "cocotb";
version = "1.2.0"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "091q63jcm87xggqgqi44lw2vjxhl1v4yl0mv2c76hgavb29w4w5y"; sha256 = "0gwd79zm7196fhnbzbdpyvgzsfjfzl3pmc5hh27h7hckfpxzj9yw";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -24,10 +24,10 @@ buildPythonPackage rec {
cocotb/share/makefiles/simulators/Makefile.* cocotb/share/makefiles/simulators/Makefile.*
do do
substituteInPlace $f --replace 'shell which' 'shell command -v' substituteInPlace $f --replace 'shell which' 'shell command -v'
# replace hardcoded gcc. Remove once https://github.com/cocotb/cocotb/pull/1137 gets merged
substituteInPlace $f --replace 'gcc' '$(CC)'
substituteInPlace $f --replace 'g++' '$(CXX)'
done done
# This can probably be removed in the next update after 1.3.0
substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" ""
''; '';
checkInputs = [ swig verilog ]; checkInputs = [ swig verilog ];
@ -39,7 +39,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python"; description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
homepage = https://github.com/cocotb/cocotb; homepage = "https://github.com/cocotb/cocotb";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ matthuszagh ]; maintainers = with maintainers; [ matthuszagh ];
}; };