diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/thrift | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/thrift')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/thrift/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/thrift/disable-failing-test.patch | 12 |
2 files changed, 20 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix index 6460be99fd47..dbd21949ecfe 100644 --- a/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "thrift"; - version = "0.14.2"; + version = "0.15.0"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-QZG/wLdJDiDMafn03G6ZH7thLUVRqp7vHb9/TEfOVU0="; + sha256 = "sha256-1Yg1ZtFh+Pbd1OIfOp4+a4JyeZ0FSCDxwlsR6GcY+Gs="; }; # Workaround to make the python wrapper not drop this package: @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { 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" diff --git a/nixpkgs/pkgs/development/libraries/thrift/disable-failing-test.patch b/nixpkgs/pkgs/development/libraries/thrift/disable-failing-test.patch new file mode 100644 index 000000000000..4307d58ddedb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/thrift/disable-failing-test.patch @@ -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 |