From 27aa04d687211fd26e176cd15124a3b95025b0d2 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 21:55:00 +0000 Subject: [PATCH 01/16] folly: 2024.12.09.00 -> 2025.01.06.00 Diff: https://github.com/facebook/folly/compare/refs/tags/v2024.12.09.00...v2025.01.06.00 --- pkgs/by-name/fo/folly/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 5f25a495024d..3cbe8f34677f 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2024.12.09.00"; + version = "2025.01.06.00"; # split outputs to reduce downstream closure sizes outputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "folly"; tag = "v${finalAttrs.version}"; - hash = "sha256-uX63Zg0Dy5kHdDFYAX7kbVTXUyrWNsdz867VJ0191YI="; + hash = "sha256-GxHOs6jfjiKQWWFs03O/sI92OvpPsf+Xilnawb8Nygs="; }; nativeBuildInputs = [ From 66510453855c84f50f466e3171cf4db85972f97f Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 22:10:22 +0000 Subject: [PATCH 02/16] =?UTF-8?q?folly:=20add=20AUR=20patch=20for=20glog?= =?UTF-8?q?=20=E2=89=A5=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fo/folly/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 3cbe8f34677f..0ee9b228d6ea 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, @@ -121,6 +122,13 @@ stdenv.mkDerivation (finalAttrs: { # The base template for std::char_traits has been removed in LLVM 19 # https://releases.llvm.org/19.1.0/projects/libcxx/docs/ReleaseNotes.html ./char_traits.patch + + # + (fetchpatch { + name = "folly-fix-glog-0.7.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-cmake-find-glog.patch?h=folly&id=4b68f47338d4b20111e3ffa1291433120bb899f0"; + hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE="; + }) ]; # https://github.com/NixOS/nixpkgs/issues/144170 From 71658f5160f9ad8785c29c569cea021dcbffcf03 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 21:55:11 +0000 Subject: [PATCH 03/16] fizz: 2024.12.09.00 -> 2025.01.06.00 Diff: https://github.com/facebookincubator/fizz/compare/refs/tags/v2024.12.09.00...v2025.01.06.00 Changelog: https://github.com/facebookincubator/fizz/releases/tag/v2025.01.06.00 --- pkgs/by-name/fi/fizz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 5698813aeeac..7079baf88e2a 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2024.12.09.00"; + version = "2025.01.06.00"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-fdaNIGndj3tCbMHE+nVtw+aTxrlaftz6gs9VFs1ANqs="; + hash = "sha256-ENMWP4CkJHe6Z0qsRNkmgw8NcYQvduAs7jIZLwirsCs="; }; nativeBuildInputs = [ From b47bfcac940720362115d2fb885447ff55dd10db Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 22:29:46 +0000 Subject: [PATCH 04/16] =?UTF-8?q?fizz:=20add=20patch=20for=20glog=20?= =?UTF-8?q?=E2=89=A5=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fi/fizz/glog-0.7.patch | 30 +++++++++++++++++++++++++++++ pkgs/by-name/fi/fizz/package.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/by-name/fi/fizz/glog-0.7.patch diff --git a/pkgs/by-name/fi/fizz/glog-0.7.patch b/pkgs/by-name/fi/fizz/glog-0.7.patch new file mode 100644 index 000000000000..263cce53baa9 --- /dev/null +++ b/pkgs/by-name/fi/fizz/glog-0.7.patch @@ -0,0 +1,30 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index c60177c2b9..425326c529 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -50,7 +50,7 @@ + find_package(fmt CONFIG REQUIRED) + + find_package(OpenSSL REQUIRED) +-find_package(Glog REQUIRED) ++find_package(Glog CONFIG REQUIRED) + find_package(Threads REQUIRED) + find_package(Zstd REQUIRED) + if (UNIX AND NOT APPLE) +@@ -198,7 +198,6 @@ + ${sodium_INCLUDE_DIR} + ${ZSTD_INCLUDE_DIR} + PRIVATE +- ${GLOG_INCLUDE_DIRS} + ${FIZZ_INCLUDE_DIRECTORIES} + ) + +@@ -212,7 +211,7 @@ + ZLIB::ZLIB + ${ZSTD_LIBRARY} + PRIVATE +- ${GLOG_LIBRARIES} ++ glog::glog + ${GFLAGS_LIBRARIES} + ${FIZZ_LINK_LIBRARIES} + ${CMAKE_DL_LIBS} diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 7079baf88e2a..3d09d856ef4f 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ENMWP4CkJHe6Z0qsRNkmgw8NcYQvduAs7jIZLwirsCs="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja From 61573fe6af0c37997c1b9f08ce020b728c7b92b7 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 21:55:16 +0000 Subject: [PATCH 05/16] mvfst: 2024.12.09.00 -> 2025.01.06.00 Diff: https://github.com/facebook/mvfst/compare/refs/tags/v2024.12.09.00...v2025.01.06.00 --- pkgs/by-name/mv/mvfst/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 7e961b52e65c..7823ea3ab2e6 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2024.12.09.00"; + version = "2025.01.06.00"; outputs = [ "bin" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-AZauUGOJxspBLSg3bAV3xviYkH4wm7aPJ8SrD+mPHBM="; + hash = "sha256-xgqVksPcm9CStAK32oNz7DT0CVzFb8ANohNxtyP0iT0="; }; nativeBuildInputs = [ From 9be2575dda8cf7ea1eba55ac4cf9c836e178c161 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 22:53:47 +0000 Subject: [PATCH 06/16] =?UTF-8?q?mvfst:=20add=20patch=20for=20glog=20?= =?UTF-8?q?=E2=89=A5=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/mv/mvfst/glog-0.7.patch | 26 ++++++++++++++++++++++++++ pkgs/by-name/mv/mvfst/package.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/by-name/mv/mvfst/glog-0.7.patch diff --git a/pkgs/by-name/mv/mvfst/glog-0.7.patch b/pkgs/by-name/mv/mvfst/glog-0.7.patch new file mode 100644 index 000000000000..0f72a615b98e --- /dev/null +++ b/pkgs/by-name/mv/mvfst/glog-0.7.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a878c7c473..c76c989f91 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ + find_package(fmt REQUIRED) + find_package(folly REQUIRED) + find_package(Fizz REQUIRED) +-find_package(Glog REQUIRED) ++find_package(Glog CONFIG REQUIRED) + find_package(Threads) + + SET(GFLAG_DEPENDENCIES "") +diff --git a/cmake/QuicTest.cmake b/cmake/QuicTest.cmake +index e7d9f0c0c3..5f4525189c 100644 +--- a/cmake/QuicTest.cmake ++++ b/cmake/QuicTest.cmake +@@ -50,7 +50,7 @@ + target_link_libraries(${QUIC_TEST_TARGET} PUBLIC + "${QUIC_TEST_DEPENDS}" + ${LIBGMOCK_LIBRARIES} +- ${GLOG_LIBRARY} ++ glog::glog + ) + + # Per https://github.com/facebook/mvfst/pull/9, disable some warnings diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 7823ea3ab2e6..0179fa3621e7 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-xgqVksPcm9CStAK32oNz7DT0CVzFb8ANohNxtyP0iT0="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja From 8233589b0916b0107af44b87b3951d7e98f8b71b Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 21:55:27 +0000 Subject: [PATCH 07/16] wangle: 2024.12.09.00 -> 2025.01.06.00 Diff: https://github.com/facebook/wangle/compare/refs/tags/v2024.12.09.00...v2025.01.06.00 --- pkgs/by-name/wa/wangle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 88e0b2bde15a..4efe42070e21 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2024.12.09.00"; + version = "2025.01.06.00"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-alRlq5gHVlyY1B8344D9C1EHjgQWl4VaOcTVhZ9NdSI="; + hash = "sha256-H10BwlKypOuxqrV8BpeJd7gWUqYrCaoW0HwV4I7nxu0="; }; nativeBuildInputs = [ From 064d4ee2207704021b40ab43cb00c40f6353c74c Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 22:47:14 +0000 Subject: [PATCH 08/16] =?UTF-8?q?wangle:=20add=20patch=20for=20glog=20?= =?UTF-8?q?=E2=89=A5=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/wa/wangle/glog-0.7.patch | 30 +++++++++++++++++++++++++++ pkgs/by-name/wa/wangle/package.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/by-name/wa/wangle/glog-0.7.patch diff --git a/pkgs/by-name/wa/wangle/glog-0.7.patch b/pkgs/by-name/wa/wangle/glog-0.7.patch new file mode 100644 index 000000000000..c80c13d8f78f --- /dev/null +++ b/pkgs/by-name/wa/wangle/glog-0.7.patch @@ -0,0 +1,30 @@ +diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt +index 041e73c2b1..2804ad72cf 100644 +--- a/wangle/CMakeLists.txt ++++ b/wangle/CMakeLists.txt +@@ -66,7 +66,7 @@ + find_package(fizz CONFIG REQUIRED) + find_package(fmt CONFIG REQUIRED) + find_package(OpenSSL REQUIRED) +-find_package(Glog REQUIRED) ++find_package(Glog CONFIG REQUIRED) + find_package(gflags CONFIG QUIET) + if (gflags_FOUND) + message(STATUS "Found gflags from package config") +@@ -162,7 +162,6 @@ + ${FOLLY_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIRS} + ${GFLAGS_INCLUDE_DIRS} + ${LIBEVENT_INCLUDE_DIR} + ${DOUBLE_CONVERSION_INCLUDE_DIR} +@@ -172,7 +171,7 @@ + ${FIZZ_LIBRARIES} + ${Boost_LIBRARIES} + ${OPENSSL_LIBRARIES} +- ${GLOG_LIBRARIES} ++ glog::glog + ${GFLAGS_LIBRARIES} + ${LIBEVENT_LIB} + ${DOUBLE_CONVERSION_LIBRARY} diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 4efe42070e21..5d1a723a1b82 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-H10BwlKypOuxqrV8BpeJd7gWUqYrCaoW0HwV4I7nxu0="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja From fb02dbce966f89b2b51666300f97ea4f4adefa47 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 21:55:53 +0000 Subject: [PATCH 09/16] fbthrift: 2024.12.09.00 -> 2025.01.06.00 Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2024.12.09.00...v2025.01.06.00 --- pkgs/by-name/fb/fbthrift/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index a648ed48b394..7ef22f87bf73 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2024.12.09.00"; + version = "2025.01.06.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-u0XsGasHaHKXJoADpszwZ/4LnChYofXBdFNZ6UjFUqg="; + hash = "sha256-VIWUh238MJDGxf6j/yanom9SNnNjBBzGbpg/SAquN5E="; }; patches = [ From 9a008831fd9395c62bd8b5853088f9bd148e516b Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 23:08:55 +0000 Subject: [PATCH 10/16] =?UTF-8?q?fbthrift:=20add=20patch=20for=20glog=20?= =?UTF-8?q?=E2=89=A5=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fb/fbthrift/glog-0.7.patch | 87 +++++++++++++++++++++++++ pkgs/by-name/fb/fbthrift/package.nix | 2 + 2 files changed, 89 insertions(+) create mode 100644 pkgs/by-name/fb/fbthrift/glog-0.7.patch diff --git a/pkgs/by-name/fb/fbthrift/glog-0.7.patch b/pkgs/by-name/fb/fbthrift/glog-0.7.patch new file mode 100644 index 000000000000..23cff743614c --- /dev/null +++ b/pkgs/by-name/fb/fbthrift/glog-0.7.patch @@ -0,0 +1,87 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6b2b2a810..1813c88e42 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,7 +106,7 @@ endif () + # Find required dependencies for thrift/lib + if (THRIFT_LIB_ONLY OR build_all) + find_package(Gflags REQUIRED) +- find_package(Glog REQUIRED) ++ find_package(Glog CONFIG REQUIRED) + find_package(folly CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) + find_package(wangle CONFIG REQUIRED) +@@ -119,7 +119,6 @@ if (THRIFT_LIB_ONLY OR build_all) + find_package(Threads) + include_directories( + ${LIBGFLAGS_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${ZSTD_INCLUDE_DIRS} + ${Xxhash_INCLUDE_DIR} +diff --git a/thrift/example/cpp2/CMakeLists.txt b/thrift/example/cpp2/CMakeLists.txt +index afa28dad61..318860b3d6 100644 +--- a/thrift/example/cpp2/CMakeLists.txt ++++ b/thrift/example/cpp2/CMakeLists.txt +@@ -28,7 +28,7 @@ target_link_libraries( + thriftcpp2 + chatroom-cpp2 + ${LIBGFLAGS_LIBRARY} +- ${GLOG_LIBRARIES} ++ glog::glog + ) + install( + TARGETS example_server +diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt +index 6461588a86..8b6ed1b030 100644 +--- a/thrift/lib/cpp/CMakeLists.txt ++++ b/thrift/lib/cpp/CMakeLists.txt +@@ -45,7 +45,7 @@ target_link_libraries( + PUBLIC + Folly::folly + ${LIBGFLAGS_LIBRARY} +- ${GLOG_LIBRARIES} ++ glog::glog + ) + + add_library( +@@ -121,7 +121,7 @@ target_link_libraries( + Boost::boost + Folly::folly + wangle::wangle +- ${GLOG_LIBRARIES} ++ glog::glog + ${OPENSSL_LIBRARIES} + ) + +@@ -137,7 +137,7 @@ target_link_libraries( + thriftprotocol + transport + Folly::folly +- ${GLOG_LIBRARIES} ++ glog::glog + ) + + set(THRIFT1_HEADER_DIRS +diff --git a/thrift/lib/cpp2/CMakeLists.txt b/thrift/lib/cpp2/CMakeLists.txt +index f941688ab0..b3609bbc62 100644 +--- a/thrift/lib/cpp2/CMakeLists.txt ++++ b/thrift/lib/cpp2/CMakeLists.txt +@@ -75,7 +75,7 @@ target_link_libraries( + Folly::folly + thriftmetadata + thriftprotocol +- ${GLOG_LIBRARIES} ++ glog::glog + ${LIBGFLAGS_LIBRARY} + ) + +@@ -206,7 +206,7 @@ target_link_libraries( + thrift + Folly::folly + wangle::wangle +- ${GLOG_LIBRARIES} ++ glog::glog + thrift-core + ) + diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index 7ef22f87bf73..649564e6f8b5 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: { # Remove a line that breaks the build due to the CMake classic of # incorrect path concatenation. ./remove-cmake-install-rpath.patch + + ./glog-0.7.patch ]; nativeBuildInputs = [ From 43fecd0b05b674e97abe5b3c0d55bed38535e831 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 21:55:58 +0000 Subject: [PATCH 11/16] fb303: 2024.12.09.00 -> 2025.01.06.00 Diff: https://github.com/facebook/fb303/compare/refs/tags/v2024.12.09.00...v2025.01.06.00 --- pkgs/by-name/fb/fb303/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index 0435aecaa1d5..26bfa007e637 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2024.12.09.00"; + version = "2025.01.06.00"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-XG/qW+XT1BVN8ZLTN2lqNBxi0x8fx3n/779BJN2lE4E="; + hash = "sha256-SW1dRo1Wr14eHzYPg7Wm4QypFpNGXeaFlreEVWWyWgs="; }; nativeBuildInputs = [ From 6070282af3886cb0a382e1d758b25b4f41540c6b Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 23:17:53 +0000 Subject: [PATCH 12/16] =?UTF-8?q?fb303:=20add=20patch=20for=20glog=20?= =?UTF-8?q?=E2=89=A5=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fb/fb303/glog-0.7.patch | 29 ++++++++++++++++++++++++++++ pkgs/by-name/fb/fb303/package.nix | 4 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/by-name/fb/fb303/glog-0.7.patch diff --git a/pkgs/by-name/fb/fb303/glog-0.7.patch b/pkgs/by-name/fb/fb303/glog-0.7.patch new file mode 100644 index 000000000000..ef95f550f121 --- /dev/null +++ b/pkgs/by-name/fb/fb303/glog-0.7.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 477b8d6a55..cfeae9ab3f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,7 +56,7 @@ + + find_package(Gflags REQUIRED) + +-find_package(Glog MODULE REQUIRED) ++find_package(Glog CONFIG REQUIRED) + + find_package(folly CONFIG REQUIRED) + +@@ -88,7 +88,6 @@ + + target_include_directories(fb303 PUBLIC + ${GFLAGS_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIR} + ${DOUBLE_CONVERSION_INCLUDE_DIR} + $ + $ +@@ -98,6 +97,7 @@ + fb303_thrift_cpp + Folly::folly + FBThrift::thrift ++ glog::glog + ) + + install( diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index 26bfa007e637..c8f621acd987 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SW1dRo1Wr14eHzYPg7Wm4QypFpNGXeaFlreEVWWyWgs="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja From 40bc7c2bd5e13b10c4aa4e9c2a6f73b6ef690dc4 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 21:56:04 +0000 Subject: [PATCH 13/16] edencommon: 2024.12.09.00 -> 2025.01.06.00 Diff: https://github.com/facebookexperimental/edencommon/compare/refs/tags/v2024.12.09.00...v2025.01.06.00 --- pkgs/by-name/ed/edencommon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 4d95c10cf202..6b857df4fd3c 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2024.12.09.00"; + version = "2025.01.06.00"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookexperimental"; repo = "edencommon"; tag = "v${finalAttrs.version}"; - hash = "sha256-2kn7RCFNpsfyXFWhV7ikXiCCLMND185JRyxAnNq/1ro="; + hash = "sha256-9JCyXFWglnIuDw5jSSqcnuMfQ2JXMdNwFVyyBccjoag="; }; patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ From 05f5a382f7888529d3190c6d81060db2ca24da22 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 23:22:22 +0000 Subject: [PATCH 14/16] =?UTF-8?q?edencommon:=20add=20patch=20for=20glog=20?= =?UTF-8?q?=E2=89=A5=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ed/edencommon/glog-0.7.patch | 27 +++++++++++++++++++++++ pkgs/by-name/ed/edencommon/package.nix | 12 ++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/ed/edencommon/glog-0.7.patch diff --git a/pkgs/by-name/ed/edencommon/glog-0.7.patch b/pkgs/by-name/ed/edencommon/glog-0.7.patch new file mode 100644 index 000000000000..1c9431c58c86 --- /dev/null +++ b/pkgs/by-name/ed/edencommon/glog-0.7.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d7b3454df..2ce7b5af1a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,8 +50,7 @@ + "${CMAKE_CURRENT_SOURCE_DIR}/build/fbcode_builder/CMake" + ${CMAKE_MODULE_PATH}) + +-find_package(Glog MODULE REQUIRED) +-include_directories(${GLOG_INCLUDE_DIR}) ++find_package(Glog CONFIG REQUIRED) + + find_package(Gflags REQUIRED) + include_directories(${GFLAGS_INCLUDE_DIR}) +diff --git a/eden/common/testharness/CMakeLists.txt b/eden/common/testharness/CMakeLists.txt +index bef7421906..f35067efa9 100644 +--- a/eden/common/testharness/CMakeLists.txt ++++ b/eden/common/testharness/CMakeLists.txt +@@ -19,7 +19,7 @@ + ${BOOST_LIBRARIES} + Folly::folly_test_util + ${LIBGMOCK_LIBRARIES} +- ${GLOG_LIBRARY} ++ glog::glog + ) + + target_include_directories( diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 6b857df4fd3c..b205a2653663 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -35,10 +35,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9JCyXFWglnIuDw5jSSqcnuMfQ2JXMdNwFVyyBccjoag="; }; - patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - # Test discovery timeout is bizarrely flaky on `x86_64-darwin` - ./increase-test-discovery-timeout.patch - ]; + patches = + [ + ./glog-0.7.patch + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # Test discovery timeout is bizarrely flaky on `x86_64-darwin` + ./increase-test-discovery-timeout.patch + ]; nativeBuildInputs = [ cmake From ab6e42769f2dc50330667deaa7eeb0328de95bf3 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 23:51:47 +0000 Subject: [PATCH 15/16] watchman: 2024.12.09.00 -> 2025.01.06.00 Diff: https://github.com/facebook/watchman/compare/refs/tags/v2024.12.09.00...v2025.01.06.00 --- pkgs/by-name/wa/watchman/Cargo.lock | 86 +++++++++++++++------------- pkgs/by-name/wa/watchman/package.nix | 4 +- 2 files changed, 48 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/wa/watchman/Cargo.lock b/pkgs/by-name/wa/watchman/Cargo.lock index 82fd309aaafa..8e5f4543a1fc 100644 --- a/pkgs/by-name/wa/watchman/Cargo.lock +++ b/pkgs/by-name/wa/watchman/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "atty" @@ -110,6 +110,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "clap" version = "2.34.0" @@ -146,18 +152,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -174,18 +180,18 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "duct" @@ -267,7 +273,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.95", ] [[package]] @@ -360,9 +366,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.168" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "lock_api" @@ -394,18 +400,18 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ "adler2", ] @@ -423,15 +429,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases", "libc", "memoffset", - "pin-utils", ] [[package]] @@ -445,9 +451,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.5" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] @@ -493,9 +499,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -538,9 +544,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -594,9 +600,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -624,20 +630,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.95", ] [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", @@ -732,9 +738,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.90" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -791,7 +797,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.95", ] [[package]] @@ -821,7 +827,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.95", ] [[package]] @@ -1069,5 +1075,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.95", ] diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index fd3625a60086..6f8eb1050632 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2024.12.09.00"; + version = "2025.01.06.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-w8Xm0xAkPH/Yapph/K8uPoPQxfc9bHLEDr0wFrNJ2LA="; + hash = "sha256-W37+xs+Fj2yL9KzR9CugfgbFl+g3f+2Dx+xL9MpQEQ4="; }; nativeBuildInputs = [ From e9e5260a6e4eff03f68f6d9045f52adc2c60360b Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 23:31:55 +0000 Subject: [PATCH 16/16] =?UTF-8?q?watchman:=20add=20patch=20for=20glog=20?= =?UTF-8?q?=E2=89=A5=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/wa/watchman/glog-0.7.patch | 21 +++++++++++++++++++++ pkgs/by-name/wa/watchman/package.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/by-name/wa/watchman/glog-0.7.patch diff --git a/pkgs/by-name/wa/watchman/glog-0.7.patch b/pkgs/by-name/wa/watchman/glog-0.7.patch new file mode 100644 index 000000000000..30eaa67b424e --- /dev/null +++ b/pkgs/by-name/wa/watchman/glog-0.7.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dd6eec3320..ee74ab0008 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -333,7 +333,7 @@ + find_package(Gflags REQUIRED) + include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR}) + +-find_package(Glog REQUIRED) ++find_package(Glog CONFIG REQUIRED) + add_compile_definitions(GLOG_NO_ABBREVIATED_SEVERITIES) + + # We indirectly depend on boost. This logic needs to match +@@ -479,7 +479,6 @@ + ) + target_include_directories(third_party_deps INTERFACE + ${FOLLY_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIR} + ${GFLAGS_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} + ) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 6f8eb1050632..50d155809a40 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-W37+xs+Fj2yL9KzR9CugfgbFl+g3f+2Dx+xL9MpQEQ4="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja