google-cloud-cpp: 1.32.1 -> 1.38.0 (#163205)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
main
tobim 2 years ago committed by GitHub
parent 5ed9194b08
commit bcd781941a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      pkgs/development/libraries/google-cloud-cpp/default.nix
  2. 5
      pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml

@ -11,6 +11,7 @@
, gtest
, ninja
, nlohmann_json
, openssl
, pkg-config
, protobuf
# default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173
@ -18,29 +19,29 @@
, staticOnly ? stdenv.hostPlatform.isStatic
}:
let
googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435";
googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6";
googleapis = fetchFromGitHub {
owner = "googleapis";
repo = "googleapis";
rev = googleapisRev;
hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl";
hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY=";
};
excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml);
in
stdenv.mkDerivation rec {
pname = "google-cloud-cpp";
version = "1.32.1";
version = "1.38.0";
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-cloud-cpp";
rev = "v${version}";
sha256 = "0g720sni70nlncv4spm4rlfykdkpjnv81axfz2jd1arpdajm0mg9";
sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA=";
};
postPatch = ''
substituteInPlace external/googleapis/CMakeLists.txt \
--replace "https://github.com/googleapis/googleapis/archive/${googleapisRev}.tar.gz" "file://${googleapis}"
--replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}"
'';
nativeBuildInputs = [
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
] ++ lib.optionals (!doInstallCheck) [
# enable these dependencies when doInstallCheck failse because we're
# enable these dependencies when doInstallCheck is false because we're
# unconditionally building tests and benchmarks
#
# when doInstallCheck is true, these deps are added to installCheckInputs
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
curl
grpc
nlohmann_json
openssl
protobuf
];

@ -1,6 +1,6 @@
whole = [
"bigquery_bigquery_read_integration_test",
"bigtable_admin_backup_integration_test",
"bigtable_admin_admin_iam_policy_integration_test",
"bigtable_admin_iam_policy_integration_test",
"bigtable_admin_integration_test",
"bigtable_apply_read_latency_benchmark",
@ -15,12 +15,15 @@ whole = [
"bigtable_table_sample_rows_integration_test",
"iam_iam_credentials_integration_test",
"iam_iam_integration_test",
"logging_quickstart",
"pubsub_endurance",
"pubsub_schema_admin_integration_test",
"pubsub_subscriber_integration_test",
"pubsub_subscription_admin_integration_test",
"pubsub_throughput",
"pubsub_topic_admin_integration_test",
"rest_internal_internal_curl_rest_client_integration_test",
"rest_internal_internal_unified_rest_credentials_integration_test",
"spanner_admin_backup_extra_integration_test",
"spanner_admin_database_admin_integration_test",
"spanner_admin_instance_admin_integration_test",

Loading…
Cancel
Save