From 206e998c067ef9fd6c7e28fd8c7d9f504f3d8bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 13 Feb 2021 02:34:26 +0100 Subject: [PATCH] python3Packages.cocotb: Mark broken on darwin, remove stale substituteInPlace --- pkgs/development/python-modules/cocotb/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 9cbf86ab1cf2..ec5cbe827768 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }: buildPythonPackage rec { pname = "cocotb"; @@ -25,9 +25,6 @@ buildPythonPackage rec { do substituteInPlace $f --replace 'shell which' 'shell command -v' done - - # This can perhaps be removed in the next update after 1.3.2? - substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" "" ''; checkInputs = [ swig verilog ]; @@ -36,8 +33,7 @@ buildPythonPackage rec { # test expected failures actually pass because of a fix in our icarus version # https://github.com/cocotb/cocotb/issues/1952 substituteInPlace tests/test_cases/test_discovery/test_discovery.py \ - --replace 'def access_single_bit' $'def foo(x): pass\ndef foo' \ - --replace 'def access_single_bit_assignment' $'def foo(x): pass\ndef foo' + --replace 'def access_single_bit' $'def foo(x): pass\ndef foo' export PATH=$out/bin:$PATH make test @@ -48,5 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; maintainers = with maintainers; [ matthuszagh ]; + broken = stdenv.isDarwin; }; }