Skip to content

Commit

Permalink
{folly,fizz,mvfst,wangle,fbthrift,fb303,edencommon,watchman}: 2024.1…
Browse files Browse the repository at this point in the history
…1.18.00 -> 2024.12.09.00 (#362234)
  • Loading branch information
vcunat committed Dec 23, 2024
2 parents 4d40b99 + 748bb47 commit dd21e38
Show file tree
Hide file tree
Showing 10 changed files with 93 additions and 64 deletions.
4 changes: 2 additions & 2 deletions pkgs/by-name/ed/edencommon/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "edencommon";
version = "2024.11.18.00";
version = "2024.12.09.00";

outputs = [
"out"
Expand All @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebookexperimental";
repo = "edencommon";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-pVPkH80vowdpwWv/h6ovEk335OeI6/0k0cAFhhFqSDM=";
hash = "sha256-2kn7RCFNpsfyXFWhV7ikXiCCLMND185JRyxAnNq/1ro=";
};

patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/fb/fb303/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "fb303";
version = "2024.11.18.00";
version = "2024.12.09.00";

outputs = [
"out"
Expand All @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "fb303";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-3zQLX42qeOE2bbFmu4Kuvu0Fvq2mBq8YgkVGpyfwaak=";
hash = "sha256-XG/qW+XT1BVN8ZLTN2lqNBxi0x8fx3n/779BJN2lE4E=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/fb/fbthrift/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "fbthrift";
version = "2024.11.18.00";
version = "2024.12.09.00";

outputs = [
# Trying to split this up further into `bin`, `out`, and `dev`
Expand All @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "fbthrift";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-dJf4vaIcat24WiKLFNEqeCnJYiO+c5YkuFu+hrS6cPE=";
hash = "sha256-u0XsGasHaHKXJoADpszwZ/4LnChYofXBdFNZ6UjFUqg=";
};

patches = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/fi/fizz/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "fizz";
version = "2024.11.18.00";
version = "2024.12.09.00";

outputs = [
"bin"
Expand All @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebookincubator";
repo = "fizz";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-mNe+CHEXhkwzek9qy2l6zvPXim9tJV44s+naSm6bQ4Q=";
hash = "sha256-fdaNIGndj3tCbMHE+nVtw+aTxrlaftz6gs9VFs1ANqs=";
};

nativeBuildInputs = [
Expand Down
29 changes: 29 additions & 0 deletions pkgs/by-name/fo/folly/char_traits.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/folly/memory/test/UninitializedMemoryHacksTest.cpp b/folly/memory/test/UninitializedMemoryHacksTest.cpp
index 38e27c3..17424af 100644
--- a/folly/memory/test/UninitializedMemoryHacksTest.cpp
+++ b/folly/memory/test/UninitializedMemoryHacksTest.cpp
@@ -283,7 +283,7 @@ TEST(UninitializedMemoryHacks, simpleStringWChar) {
}

TEST(UninitializedMemoryHacks, simpleStringSChar) {
- testSimple<std::basic_string<signed char>>();
+ testSimple<std::basic_string<char>>();
}

TEST(UninitializedMemoryHacks, simpleVectorChar) {
@@ -307,7 +307,7 @@ TEST(UninitializedMemoryHacks, randomStringWChar) {
}

TEST(UninitializedMemoryHacks, randomStringSChar) {
- testRandom<std::basic_string<signed char>>();
+ testRandom<std::basic_string<char>>();
}

TEST(UninitializedMemoryHacks, randomVectorChar) {
@@ -323,5 +323,5 @@ TEST(UninitializedMemoryHacks, randomVectorInt) {
}

// We are deliberately putting this at the bottom to make sure it can follow use
-FOLLY_DECLARE_STRING_RESIZE_WITHOUT_INIT(signed char)
+//FOLLY_DECLARE_STRING_RESIZE_WITHOUT_INIT(char)
FOLLY_DECLARE_VECTOR_RESIZE_WITHOUT_INIT(int)
12 changes: 10 additions & 2 deletions pkgs/by-name/fo/folly/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "folly";
version = "2024.11.18.00";
version = "2024.12.09.00";

# split outputs to reduce downstream closure sizes
outputs = [
Expand All @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "folly";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-CX4YzNs64yeq/nDDaYfD5y8GKrxBueW4y275edPoS0c=";
hash = "sha256-uX63Zg0Dy5kHdDFYAX7kbVTXUyrWNsdz867VJ0191YI=";
};

nativeBuildInputs = [
Expand Down Expand Up @@ -124,6 +124,12 @@ stdenv.mkDerivation (finalAttrs: {

doCheck = true;

patches = [
# 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
];

# https://github.com/NixOS/nixpkgs/issues/144170
postPatch = ''
substituteInPlace CMake/libfolly.pc.in \
Expand Down Expand Up @@ -169,6 +175,8 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"buffered_atomic_test.BufferedAtomic.singleThreadUnguardedAccess"
"io_async_notification_queue_test.NotificationQueueTest.UseAfterFork"
"container_heap_vector_types_test.HeapVectorTypes.SimpleSetTes"
]
)
)
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/mv/mvfst/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "mvfst";
version = "2024.11.18.00";
version = "2024.12.09.00";

outputs = [
"bin"
Expand All @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "mvfst";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-2Iqk6QshM8fVO65uIqrTbex7aj8ELNSzNseYEeNdzCY=";
hash = "sha256-AZauUGOJxspBLSg3bAV3xviYkH4wm7aPJ8SrD+mPHBM=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/wa/wangle/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "wangle";
version = "2024.11.18.00";
version = "2024.12.09.00";

outputs = [
"out"
Expand All @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "wangle";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-4mqE9GgJP2f7QAykwdhMFoReE9wmPKOXqSHJ2MHP2G0=";
hash = "sha256-alRlq5gHVlyY1B8344D9C1EHjgQWl4VaOcTVhZ9NdSI=";
};

nativeBuildInputs = [
Expand Down
Loading

0 comments on commit dd21e38

Please sign in to comment.