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

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-04-04 06:05:28 +00:00 committed by GitHub
parent 1ffe4a4f49 dc6a8abb69
commit 397730e0f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/development/libraries/thrift/default.nix
View File

@ -1,26 +1,17 @@
{ lib, stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkg-config
, bison, flex, twisted
, static ? stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {
pname = "thrift";
version = "0.13.0";
version = "0.14.1";
src = fetchurl {
url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
sha256 = "0yai9c3bdsrkkjshgim7zk0i7malwfprg00l9774dbrkh2w4ilvs";
sha256 = "198c855mjy5byqfb941hiyq2j37baz63f0wcfy4vp8y8v4f5xnhk";
};
patches = [
# Fix a failing test on darwin
# https://issues.apache.org/jira/browse/THRIFT-4976
(fetchpatch {
url = "https://github.com/apache/thrift/commit/6701dbb8e89f6550c7843e9b75b118998df471c3.diff";
sha256 = "14rqma2b2zv3zxkkl5iv9kvyp3zihvad6fdc2gcdqv37nqnswx9d";
})
];
# Workaround to make the python wrapper not drop this package:
# pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
pythonPath = [];
@ -32,6 +23,9 @@ stdenv.mkDerivation rec {
preConfigure = "export PY_PREFIX=$out";
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"}"
@ -40,11 +34,32 @@ stdenv.mkDerivation rec {
"-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 PythonTestSSLSocket
${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))"
runHook postCheck
'';
@ -56,8 +71,5 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
knownVulnerabilities = [
"CVE-2020-13949"
];
};
}

13
pkgs/development/python-modules/aqualogic/default.nix
View File

@ -1,21 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pyserial
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aqualogic";
version = "2.5";
version = "2.6";
src = fetchFromGitHub {
owner = "swilson";
repo = pname;
rev = version;
sha256 = "sha256-yxd+A5dsB9gBwVlPNjz+IgDHKTktNky84bWZMhA/xa4=";
sha256 = "sha256-dAC/0OjvrC8J/5pu5vcOKV/WqgkAlz0LuFl0up6FQRM=";
};
patches = [
(fetchpatch {
name = "allow-iobase-objects.patch";
url = "https://github.com/swilson/aqualogic/commit/185fe25a86c82c497a55c78914b55ed39f5ca339.patch";
sha256 = "072jrrsqv86bn3skibjc57111jlpm8pq2503997fl3h4v6ziwdxg";
})
];
propagatedBuildInputs = [ pyserial ];
checkInputs = [ pytestCheckHook ];

10
pkgs/tools/misc/exa/default.nix
View File

@ -4,15 +4,15 @@
rustPlatform.buildRustPackage rec {
pname = "exa";
version = "unstable-2021-01-14";
version = "0.10.0";
cargoSha256 = "1lmjh0grpnx20y6raxnxgjkr92h395r6jk8mm2ypc4cxpxczdqvl";
cargoSha256 = "sha256-hslQZkmZ023gKxBbfgwqazBPUk0qWyy51uRJtr3QvWE=";
src = fetchFromGitHub {
owner = "ogham";
repo = pname;
rev = "13b91cced4cab012413b25c9d3e30c63548639d0";
sha256 = "18y4v1s102lh3gvgjwdd66qlsr75wpwpcj8zsk5y5r95a405dkfm";
rev = "v${version}";
sha256 = "sha256-xolanu4zhAwsbSPdGKgY2/uHtP30DSpr/7Vv1z4jEnQ=";
};
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec {
'';
homepage = "https://the.exa.website";
license = licenses.mit;
maintainers = with maintainers; [ ehegnes lilyball globin ];
maintainers = with maintainers; [ ehegnes lilyball globin fortuneteller2k ];
};
}