BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #216968 from tobim/pkgs/thrift-0.18

Browse source 
thrift: 0.17.0 -> 0.18.0
This commit is contained in:
Sandro 2023-02-21 10:12:28 +01:00 committed by GitHub
commit afa499a332
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/thrift/default.nix
View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "thrift";
version = "0.17.0";
version = "0.18.0";
src = fetchurl {
url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
hash = "sha256-snLBeIuxZdmVIaJZmzG5f6aeWTHQmQFdka4QegsMxY8=";
hash = "sha256-fBk4nLeRCiDli45GkDyMGjY1MAj5/MGwP3SKzPm18+E=";
};
# Workaround to make the Python wrapper not drop this package:
@ -74,6 +74,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/apache/thrift/commit/2ab850824f75d448f2ba14a468fb77d2594998df.diff";
hash = "sha256-ejMKFG/cJgoPlAFzVDPI4vIIL7URqaG06/IWdQ2NkhY=";
})
(fetchpatch {
name = "thrift-fix-tests-OpenSSL3.patch"; # https://github.com/apache/thrift/pull/2760
url = "https://github.com/apache/thrift/commit/eae3ac418f36c73833746bcd53e69ed8a12f0e1a.diff";
hash = "sha256-0jlN4fo94cfGFUKcLFQgVMI/x7uxn5OiLiFk6txVPzs=";
})
];
cmakeFlags = [
@ -90,6 +95,7 @@ stdenv.mkDerivation rec {
disabledTests = [
"PythonTestSSLSocket"
"PythonThriftTNonblockingServer"
] ++ lib.optionals stdenv.isDarwin [
# Tests that hang up in the Darwin sandbox
"SecurityTest"
@ -106,7 +112,6 @@ stdenv.mkDerivation rec {
"StressTest"
"StressTestConcurrent"
"StressTestNonBlocking"
"PythonThriftTNonblockingServer"
];
doCheck = !static;

4
pkgs/top-level/all-packages.nix
View file

@ -23537,9 +23537,7 @@ with pkgs;
theft = callPackage ../development/libraries/theft { };
thrift = callPackage ../development/libraries/thrift {
openssl = openssl_1_1;
};
thrift = callPackage ../development/libraries/thrift { };
thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { };