colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #295662 from sdht0/fbpkgs-update

Browse Source 
{edencommon,fb303,fbthrift,fizz,folly,mvfst,wangle,watchman}: 2024.01.22.00 -> 2024.03.11.00
This commit is contained in:
Robert Scott 2024-03-15 00:30:26 +00:00 committed by GitHub
commit 81b559946f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/edencommon/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "edencommon"; pname = "edencommon";
version = "2024.01.22.00"; version = "2024.03.11.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebookexperimental"; owner = "facebookexperimental";
repo = "edencommon"; repo = "edencommon";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-KY0vXptzOEJLDjHvGd3T5oiCCvggND2bPBzvll+YBo4="; sha256 = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/fb303/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fb303"; pname = "fb303";
version = "2024.01.22.00"; version = "2024.03.11.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "fb303"; repo = "fb303";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-EQpe0REGWUpYg+llsCo4x6vJ7UPdWXk3uPM3b8b9Uf0="; sha256 = "sha256-Jtztb8CTqvRdRjUa3jaouP5PFAwoM4rKLIfgvOyXUIg=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

8
pkgs/development/libraries/fbthrift/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fbthrift"; pname = "fbthrift";
version = "2024.01.22.00"; version = "2024.03.11.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "fbthrift"; repo = "fbthrift";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vIYXX4NOs2JdhrAJKmIhf4+hQEXHue2Ok7e4cw6yups="; sha256 = "sha256-iCiiKNDlfKm1Y4SGzcSP6o/OdiRRrj9UEawW6qpBpSY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -38,7 +38,9 @@ stdenv.mkDerivation rec {
flex flex
]; ];
cmakeFlags = lib.optionals stdenv.isDarwin [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if stdenv.isDarwin then "OFF" else "ON"}"
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
]; ];

4
pkgs/development/libraries/fizz/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "fizz"; pname = "fizz";
version = "2024.01.22.00"; version = "2024.03.11.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebookincubator"; owner = "facebookincubator";
repo = "fizz"; repo = "fizz";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-17EELvRrWhUprxvm1Ur0FYNimvY1qgK0YH8ehxtLpxM="; hash = "sha256-IHWotiVUjGOvebXy4rwsh8U8UMxTrF1VaqXzZMjojiM=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

7
pkgs/development/libraries/folly/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, overrideSDK
, fetchFromGitHub , fetchFromGitHub
, boost , boost
, cmake , cmake
@ -26,13 +27,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "folly"; pname = "folly";
version = "2024.01.22.00"; version = "2024.03.11.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "folly"; repo = "folly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+z1wuEOgr7CMHFnOn5gLm9mtVH7mVURLstOoDqzxKbk="; sha256 = "sha256-INvWTw27fmVbKQIT9ebdRGMCOIzpc/NepRN2EnKLJx0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -72,6 +73,8 @@ stdenv.mkDerivation rec {
# see https://github.com/NixOS/nixpkgs/issues/144170 # see https://github.com/NixOS/nixpkgs/issues/144170
"-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_LIBDIR=lib"
] ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13"
]; ];
# split outputs to reduce downstream closure sizes # split outputs to reduce downstream closure sizes

4
pkgs/development/libraries/mvfst/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mvfst"; pname = "mvfst";
version = "2024.01.22.00"; version = "2024.03.11.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "mvfst"; repo = "mvfst";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vhLwxA91v+vt5PQejhPOaj9YSkulg86hTD9GkpQKB24="; sha256 = "sha256-KjNTDgpiR9EG42Agl2JFJoPo5+8GlS27oPMWpdLq2v8=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/wangle/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "wangle"; pname = "wangle";
version = "2024.01.22.00"; version = "2024.03.11.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "wangle"; repo = "wangle";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-pXcJszncYWvtwT4guEl69rOAIXZzgF7I6qh8PqLbxdA="; sha256 = "sha256-fDtJ+9bZj+siKlMglYMkLO/+jldUmsS5V3Umk1gNdlo=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/tools/watchman/default.nix
View File

@ -34,13 +34,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "watchman"; pname = "watchman";
version = "2024.01.22.00"; version = "2024.03.11.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "watchman"; repo = "watchman";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-+qlcdekBcRwmgrtQ8HcLHphURf0c4oRCs6nbjAzT26c="; hash = "sha256-cD8mIYCc+8Z2p3rwKVRFcW9sOBbpb5KHU5VpbXHMpeg=";
}; };
cmakeFlags = [ cmakeFlags = [