From 5240499fb672c5f7e25cd84bff780062cb3cf75a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 13 May 2025 06:13:42 +0100 Subject: [PATCH] snappy: 1.2.1 -> 1.2.2 (take 2) This time we revert interface changes to not break `arrow-cpp` and others. Changes: https://github.com/google/snappy/releases/tag/1.2.2 --- pkgs/by-name/sn/snappy/package.nix | 14 +++----------- pkgs/by-name/sn/snappy/revert-PUBLIC.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/sn/snappy/revert-PUBLIC.patch diff --git a/pkgs/by-name/sn/snappy/package.nix b/pkgs/by-name/sn/snappy/package.nix index cb6c6e559b89..566dddcc4473 100644 --- a/pkgs/by-name/sn/snappy/package.nix +++ b/pkgs/by-name/sn/snappy/package.nix @@ -3,30 +3,22 @@ stdenv, fetchFromGitHub, cmake, - fetchpatch, static ? stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation rec { pname = "snappy"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "google"; repo = "snappy"; rev = version; - hash = "sha256-IzKzrMDjh+Weor+OrKdX62cAKYTdDXgldxCgNE2/8vk="; + hash = "sha256-bMZD8EI9dvDGupfos4hi/0ShBkrJlI5Np9FxE6FfrNE="; }; patches = [ - # Re-enable RTTI, without which other applications can't subclass - # snappy::Source (this breaks Ceph, as one example) - # https://tracker.ceph.com/issues/53060 - # https://build.opensuse.org/package/show/openSUSE:Factory/snappy - (fetchpatch { - url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; - sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; - }) + ./revert-PUBLIC.patch ]; outputs = [ diff --git a/pkgs/by-name/sn/snappy/revert-PUBLIC.patch b/pkgs/by-name/sn/snappy/revert-PUBLIC.patch new file mode 100644 index 000000000000..e08eec0d5684 --- /dev/null +++ b/pkgs/by-name/sn/snappy/revert-PUBLIC.patch @@ -0,0 +1,11 @@ +https://github.com/google/snappy/issues/206 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -261,7 +261,6 @@ target_sources(snappy + "snappy-stubs-internal.cc" + "snappy.cc" + "${PROJECT_BINARY_DIR}/config.h" +- PUBLIC + $ + $ + $