Unverified Commit 57d0edd3 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #285345 from risicle/ris-folly-2024.01.22.00 

folly: 2023.02.27.00 -> 2024.01.22.00, bump rest of ecosystem to 2024.01.22.00
parents 828ab020 9d4282de

pkgs/development/libraries/edencommon/default.nix

+12 −3
Original line number Diff line number Diff line 
{ stdenv, lib, cmake, fetchFromGitHub, glog, folly, fmt_8, boost, gtest }:

{ stdenv

, lib

, fetchFromGitHub

, boost

, cmake

, fmt_8

, folly

, glog

, gtest

}:



stdenv.mkDerivation rec {

  pname = "edencommon";

  version = "2023.03.06.00";

  version = "2024.01.22.00";



  src = fetchFromGitHub {

    owner = "facebookexperimental";

    repo = "edencommon";

    rev = "v${version}";

    sha256 = "sha256-m54TaxThWe6bUa6Q1t+e99CLFOvut9vq9RSmimTNuaU=";

    sha256 = "sha256-KY0vXptzOEJLDjHvGd3T5oiCCvggND2bPBzvll+YBo4=";

  };



  nativeBuildInputs = [ cmake ];

pkgs/development/libraries/fb303/default.nix

+14 −14
Original line number Diff line number Diff line
@@ -2,27 +2,26 @@ 
, lib

, fetchFromGitHub

, cmake

, glog

, folly

, fmt_8

, boost

, fbthrift

, zlib

, fizz

, folly

, glog

, libsodium

, wangle

, mvfst

, python3

, wangle

, zlib

}:



stdenv.mkDerivation rec {

  pname = "fb303";

  version = "2023.06.12.00";

  version = "2024.01.22.00";



  src = fetchFromGitHub {

    owner = "facebook";

    repo = "fb303";

    rev = "v${version}";

    sha256 = "sha256-nUOPYb5/tLyHjaZDvKuq0vdu4L7XOmO8R9nNLGAzeLI=";

    sha256 = "sha256-EQpe0REGWUpYg+llsCo4x6vJ7UPdWXk3uPM3b8b9Uf0=";

  };



  nativeBuildInputs = [ cmake ];
@@ -33,16 +32,17 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    glog

    folly

    fmt_8

    boost

    fbthrift

    zlib

    fizz

    folly

    folly.boost

    folly.fmt

    glog

    libsodium

    wangle

    mvfst

    python3

    wangle

    zlib

  ];



  meta = with lib; {

pkgs/development/libraries/fbthrift/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
, glog

, gflags

, libiberty

, mvfst

, openssl

, lib

, wangle
@@ -22,13 +23,13 @@ 


stdenv.mkDerivation rec {

  pname = "fbthrift";

  version = "2023.03.20.00";

  version = "2024.01.22.00";



  src = fetchFromGitHub {

    owner = "facebook";

    repo = "fbthrift";

    rev = "v${version}";

    sha256 = "sha256-jCgdo7jE5QlRK5f2S6XEVM4+TPWI//4DKG/fDMFzgzg=";

    sha256 = "sha256-vIYXX4NOs2JdhrAJKmIhf4+hQEXHue2Ok7e4cw6yups=";

  };



  nativeBuildInputs = [
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec { 
    gflags

    libevent

    libiberty

    mvfst

    openssl

    wangle

    zlib

pkgs/development/libraries/fizz/default.nix

+27 −8
Original line number Diff line number Diff line
@@ -17,23 +17,25 @@ 
, zlib

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "fizz";

  version = "2023.03.20.00";

  version = "2024.01.22.00";



  src = fetchFromGitHub {

    owner = "facebookincubator";

    repo = "fizz";

    rev = "refs/tags/v${version}";

    hash = "sha256-oBdTj7IPlmtF5rEgDVN/wwa0ZxkN6h2QMN3PQB0nCgQ=";

    rev = "refs/tags/v${finalAttrs.version}";

    hash = "sha256-17EELvRrWhUprxvm1Ur0FYNimvY1qgK0YH8ehxtLpxM=";

  };



  nativeBuildInputs = [ cmake ];



  cmakeDir = "../fizz";



  cmakeFlags = [ "-Wno-dev" ]

    ++ lib.optionals stdenv.isDarwin [

  cmakeFlags = [

    "-Wno-dev"

    (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)

  ] ++ lib.optionals stdenv.isDarwin [

    "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation

  ];
@@ -46,7 +48,6 @@ stdenv.mkDerivation rec { 
    folly

    glog

    gflags

    gtest

    libevent

    libiberty

    libsodium
@@ -55,6 +56,24 @@ stdenv.mkDerivation rec { 
    zstd

  ];



  doCheck = true;

  checkInputs = [

    gtest

  ];

  preCheck = let

    disabledTests = [

      # these don't work with openssl 3.x probably due to

      # https://github.com/openssl/openssl/issues/13283

      "DefaultCertificateVerifierTest.TestVerifySuccess"

      "DefaultCertificateVerifierTest.TestVerifyWithIntermediates"



      # timing-related & flaky

      "SlidingBloomReplayCacheTest.TestTimeBucketing"

    ];

  in ''

    export GTEST_FILTER="-${lib.concatStringsSep ":" disabledTests}"

  '';



  meta = with lib; {

    description = "C++14 implementation of the TLS-1.3 standard";

    homepage = "https://github.com/facebookincubator/fizz";
@@ -63,4 +82,4 @@ stdenv.mkDerivation rec { 
    platforms = platforms.unix;

    maintainers = with maintainers; [ pierreis kylesferrazza ];

  };

}
 
})

pkgs/development/libraries/folly/default.nix

+13 −4
Original line number Diff line number Diff line
@@ -18,17 +18,21 @@ 
, zstd

, jemalloc

, follyMobile ? false



# for passthru.tests

, python3

, watchman

}:



stdenv.mkDerivation rec {

  pname = "folly";

  version = "2023.02.27.00";

  version = "2024.01.22.00";



  src = fetchFromGitHub {

    owner = "facebook";

    repo = "folly";

    rev = "v${version}";

    sha256 = "sha256-DfZiVxncpKSPn9BN25d8o0/tC27+HhSG/t53WgzAT/s=";

    sha256 = "sha256-+z1wuEOgr7CMHFnOn5gLm9mtVH7mVURLstOoDqzxKbk=";

  };



  nativeBuildInputs = [
@@ -80,11 +84,16 @@ stdenv.mkDerivation rec { 
      --replace '$'{_IMPORT_PREFIX}/lib/ $out/lib/

  '';



  passthru = {

    # folly-config.cmake, will `find_package` these, thus there should be

    # a way to ensure abi compatibility.

  passthru = {

    inherit boost;

    fmt = fmt_8;



    tests = {

      inherit watchman;

      inherit (python3.pkgs) django pywatchman;

    };

  };



  meta = with lib; {