diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/development/libraries/abseil-cpp/202206.nix new file mode 100644 index 000000000000..7ca25f414040 --- /dev/null +++ b/pkgs/development/libraries/abseil-cpp/202206.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, static ? stdenv.hostPlatform.isStatic +, cxxStandard ? null +}: + +stdenv.mkDerivation rec { + pname = "abseil-cpp"; + version = "20220623.1"; + + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + rev = "refs/tags/${version}"; + hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ] ++ lib.optionals (cxxStandard != null) [ + "-DCMAKE_CXX_STANDARD=${cxxStandard}" + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An open-source collection of C++ code designed to augment the C++ standard library"; + homepage = "https://abseil.io/"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.andersk ]; + }; +} diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index d44b85337ddc..3858ac7c437f 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.48.1"; # N.B: if you change this, please update: + version = "1.50.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-It9oFenKoPDCOVxiKCGJc8i18zdDZCceR22HR5Tu1sw="; + hash = "sha256-h79Ptx17tIMFpaaid4UGzbGDztee9JctfsEcetfude0="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 77ac855e1f6f..0f659c0a14e2 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,16 +9,21 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.48.1"; + version = "1.50.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "655af4d0d6e67586cb2ca24c3db5fe08e4e2972d17f295f6b546fa7bd7eef1f6"; + sha256 = "69be81c4317ec77983fb0eab80221a01e86e833e0fcf2f6acea0a62597c84b93"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'protobuf>=4.21.6' 'protobuf' + ''; + propagatedBuildInputs = [ googleapis-common-protos grpcio diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index d386deb44221..1fbdc3973799 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,16 +2,16 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.48.1"; + version = "1.50.0"; src = fetchPypi { inherit pname version; - sha256 = "1178f2ea531f80cc2027ec64728df6ffc8e98cf1df61652a496eafd612127183"; + sha256 = "88b75f2afd889c7c6939f58d76b58ab84de4723c7de882a1f8448af6632e256f"; }; postPatch = '' substituteInPlace setup.py \ - --replace 'protobuf>=3.12.0, < 4.0dev' 'protobuf' + --replace 'protobuf>=4.21.6,<5.0dev' 'protobuf' ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 0ad6cabd9515..486742ccb605 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , buildPythonPackage -, fetchpatch , grpc , six , protobuf @@ -17,15 +16,7 @@ buildPythonPackage rec { inherit (grpc) src version; pname = "grpcio"; - - patches = [ - # Fix build on armv6l - # https://github.com/grpc/grpc/pull/30401 - (fetchpatch { - url = "https://github.com/grpc/grpc/commit/65dc9f3edeee4c2d0e9b30d5a3ee63175437bea3.patch"; - hash = "sha256-pS4FsCcSjmjSs3J5Y96UonkxqPwfpkyhrEM0t6HaMd0="; - }) - ]; + format = "setuptools"; outputs = [ "out" "dev" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fe06b4f6b16..cbc509155c7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17891,6 +17891,7 @@ with pkgs; abseil-cpp_202111 = callPackage ../development/libraries/abseil-cpp/202111.nix { }; abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; + abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { }; abseil-cpp = abseil-cpp_202103; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -19041,7 +19042,7 @@ with pkgs; grpc = callPackage ../development/libraries/grpc { # grpc builds with c++14 so abseil must also be built that way - abseil-cpp = abseil-cpp_202111.override { + abseil-cpp = abseil-cpp_202206.override { cxxStandard = "14"; }; };