uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,46 @@
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, pkg-config, bison
, flex
}:
stdenv.mkDerivation rec {
pname = "thrift";
version = "0.10.0";
src = fetchurl {
url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292";
};
#enableParallelBuilding = true; problems on hydra
# Workaround to make the python wrapper not drop this package:
# pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
pythonPath = [];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
boost zlib libevent openssl bison flex (python3.withPackages (ps: [ps.twisted]))
];
preConfigure = "export PY_PREFIX=$out";
# TODO: package boost-test, so we can run the test suite. (Currently it fails
# to find libboost_unit_test_framework.a.)
configureFlags = [ "--enable-tests=no" ];
doCheck = false;
meta = with lib; {
description = "Library for scalable cross-language services";
homepage = "https://thrift.apache.org/";
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
knownVulnerabilities = [
"CVE-2018-1320"
"CVE-2018-11798"
"CVE-2019-0205"
"CVE-2019-0210"
"CVE-2020-13949"
];
};
}

View file

@ -0,0 +1,81 @@
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, cmake, pkg-config
, bison, flex
, static ? stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {
pname = "thrift";
version = "0.16.0";
src = fetchurl {
url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-9GC1wcow2JGP+V6j62KRs5Uc9RhVNWYIjz8r6JgfYgk=";
};
# Workaround to make the python wrapper not drop this package:
# pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
pythonPath = [];
nativeBuildInputs = [ cmake pkg-config bison flex ];
buildInputs = [ boost zlib libevent openssl ]
++ lib.optionals (!static) [ (python3.withPackages (ps: [ps.twisted])) ];
preConfigure = "export PY_PREFIX=$out";
patches = [
# ToStringTest.cpp is failing from some reason due to locale issue, this
# doesn't disable all UnitTests as in Darwin.
./disable-failing-test.patch
];
cmakeFlags = [
"-DBUILD_JAVASCRIPT:BOOL=OFF"
"-DBUILD_NODEJS:BOOL=OFF"
# FIXME: Fails to link in static mode with undefined reference to
# `boost::unit_test::unit_test_main(bool (*)(), int, char**)'
"-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}"
] ++ lib.optionals static [
"-DWITH_STATIC_LIB:BOOL=ON"
"-DOPENSSL_USE_STATIC_LIBS=ON"
];
disabledTests = [
"PythonTestSSLSocket"
] ++ lib.optionals stdenv.isDarwin [
# tests that hang up in the darwin sandbox
"SecurityTest"
"SecurityFromBufferTest"
"python_test"
# tests that fail in the darwin sandbox when trying to use network
"UnitTests"
"TInterruptTest"
"TServerIntegrationTest"
"processor"
"TNonblockingServerTest"
"TNonblockingSSLServerTest"
"StressTest"
"StressTestConcurrent"
"StressTestNonBlocking"
"PythonThriftTNonblockingServer"
];
doCheck = !static;
checkPhase = ''
runHook preCheck
${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))"
runHook postCheck
'';
enableParallelChecking = false;
meta = with lib; {
description = "Library for scalable cross-language services";
homepage = "https://thrift.apache.org/";
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
};
}

View file

@ -0,0 +1,12 @@
diff --git i/lib/cpp/test/CMakeLists.txt w/lib/cpp/test/CMakeLists.txt
index 19854e1a3..9d428a166 100644
--- i/lib/cpp/test/CMakeLists.txt
+++ w/lib/cpp/test/CMakeLists.txt
@@ -77,7 +77,6 @@ set(UnitTest_SOURCES
TMemoryBufferTest.cpp
TBufferBaseTest.cpp
Base64Test.cpp
- ToStringTest.cpp
TypedefTest.cpp
TServerSocketTest.cpp
TServerTransportTest.cpp