Merge pull request #112950 from SuperSandro2000/fix-collection11

This commit is contained in:
Sandro
2021-02-13 03:31:41 +01:00
committed by GitHub
8 changed files with 30 additions and 36 deletions

View File

@@ -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;
};
}

View File

@@ -15,6 +15,9 @@ buildPythonPackage rec {
pillow
];
# no tests exectuted
doCheck = false;
meta = with lib; {
description = "Convert images to PDF via direct JPEG inclusion";
homepage = "https://gitlab.mister-muffin.de/josch/img2pdf";