commit 08287aa0e1b6991420980fdc612e42799c81f4e0 · pyrox.dev/nixpkgs

+2 -5

pkgs/development/libraries/arrow-cpp/default.nix

···

       39
       39
        
       , enableShared ? !stdenv.hostPlatform.isStatic

     

       40
       40
        
       , enableFlight ? true

     

       41
       41
        
       , enableJemalloc ? !stdenv.isDarwin

     

       42
       42
       -
         # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and

     

       43
       43
       -
         # non-existent in older versions

     

       44
       44
       -
         # see https://github.com/boostorg/process/issues/55

     

       45
       45
       -
       , enableS3 ? (!stdenv.isDarwin) || (lib.versionOlder boost.version "1.69" || lib.versionAtLeast boost.version "1.70")

     

       46
       46
       -
       , enableGcs ? (!stdenv.isDarwin) && (lib.versionAtLeast grpc.cxxStandard "17") # google-cloud-cpp is not supported on darwin, needs to support C++17

     

       42
       42
       +
       , enableS3 ? true

     

       43
       43
       +
       , enableGcs ? !stdenv.isDarwin

     

       47
       44
        
       }:

     

       48
       45
        
       

     

       49
       46
        
       assert lib.asserts.assertMsg

+4 -5

pkgs/development/libraries/google-cloud-cpp/default.nix

···

       18
       18
        
       , staticOnly ? stdenv.hostPlatform.isStatic

     

       19
       19
        
       }:

     

       20
       20
        
       let

     

       21
       21
       -
         googleapisRev = "13d5b3f3f9412f38427c8ad48068f04ad1ee9808";

     

       21
       21
       +
         googleapisRev = "85f8c758016c279fb7fa8f0d51ddc7ccc0dd5e05";

     

       22
       22
        
         googleapis = fetchFromGitHub {

     

       23
       23
        
           name = "googleapis-src";

     

       24
       24
        
           owner = "googleapis";

     

       25
       25
        
           repo = "googleapis";

     

       26
       26
        
           rev = googleapisRev;

     

       27
       27
       -
           hash = "sha256-SiU7N1EQ/7LWhUwgf4c0CBfUzNGiLe4sSbbJmJF3sao=";

     

       27
       27
       +
           hash = "sha256-4Qiz0pBgW3OZi+Z8Zq6k9E94+8q6/EFMwPh8eQxDjdI=";

     

       28
       28
        
         };

     

       29
       29
        
         excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml);

     

       30
       30
        
       in

     

       31
       31
        
       stdenv.mkDerivation rec {

     

       32
       32
        
         pname = "google-cloud-cpp";

     

       33
       33
       -
         version = "2.4.0";

     

       33
       33
       +
         version = "2.14.0";

     

       34
       34
        
       

     

       35
       35
        
         src = fetchFromGitHub {

     

       36
       36
        
           owner = "googleapis";

     

       37
       37
        
           repo = "google-cloud-cpp";

     

       38
       38
        
           rev = "v${version}";

     

       39
       39
       -
           sha256 = "sha256-o8aURM8fvxn0FZjuqJGclq9Brss8LOFZzD0FV2j/lUc=";

     

       39
       39
       +
           sha256 = "sha256-0SoOaAqvk8cVC5W3ejTfe4O/guhrro3uAzkeIpAkCpg=";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
         postPatch = ''

     
···

       120
       120
        
           # this adds a good chunk of time to the build

     

       121
       121
        
           "-DBUILD_TESTING:BOOL=ON"

     

       122
       122
        
           "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF"

     

       123
       123
       -
           "-DCMAKE_CXX_STANDARD=${grpc.cxxStandard}"

     

       124
       123
        
         ] ++ lib.optionals (apis != [ "*" ]) [

     

       125
       124
        
           "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}"

     

       126
       125
        
         ];

+48 -30

pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml

···

       1
       1
        
       whole = [

     

       2
       2
       -
         "bigquery_bigquery_read_integration_test",

     

       2
       2
       +
         "common_samples_samples",

     

       3
       3
       +
         "common_internal_grpc_impersonate_service_account_integration_test",

     

       4
       4
       +
         "common_internal_unified_rest_credentials_integration_test",

     

       5
       5
       +
         "iam_samples_iam_credentials_samples",

     

       6
       6
       +
         "iam_samples_iam_samples",

     

       7
       7
       +
         "iam_admin_v1_samples_iam_client_samples",

     

       8
       8
       +
         "iam_credentials_v1_samples_iam_credentials_client_samples",

     

       9
       9
       +
         "iam_v1_samples_iam_policy_client_samples",

     

       10
       10
       +
         "iam_v2_samples_policies_client_samples",

     

       3
       11
        
         "bigtable_admin_admin_iam_policy_integration_test",

     

       4
       4
       -
         "bigtable_admin_iam_policy_integration_test",

     

       5
       5
       -
         "bigtable_admin_integration_test",

     

       12
       12
       +
         "bigtable_bigtable_instance_admin_client_samples",

     

       13
       13
       +
         "bigtable_bigtable_table_admin_client_samples",

     

       6
       14
        
         "bigtable_apply_read_latency_benchmark",

     

       15
       15
       +
         "bigtable_endurance_benchmark",

     

       16
       16
       +
         "bigtable_mutation_batcher_throughput_benchmark",

     

       17
       17
       +
         "bigtable_read_sync_vs_async_benchmark",

     

       18
       18
       +
         "bigtable_scan_throughput_benchmark",

     

       19
       19
       +
         "bigtable_admin_iam_policy_integration_test",

     

       7
       20
        
         "bigtable_data_async_future_integration_test",

     

       8
       21
        
         "bigtable_data_integration_test",

     

       9
       9
       -
         "bigtable_endurance_benchmark",

     

       10
       22
        
         "bigtable_filters_integration_test",

     

       11
       11
       -
         "bigtable_mutation_batcher_throughput_benchmark",

     

       12
       23
        
         "bigtable_mutations_integration_test",

     

       13
       13
       -
         "bigtable_read_sync_vs_async_benchmark",

     

       14
       14
       -
         "bigtable_scan_throughput_benchmark",

     

       15
       24
        
         "bigtable_table_sample_rows_integration_test",

     

       16
       16
       -
         "common_grpc_utils_internal_grpc_impersonate_service_account_integration_test",

     

       17
       17
       -
         "iam_iam_credentials_integration_test",

     

       18
       18
       -
         "iam_iam_integration_test",

     

       25
       25
       +
         "bigquery_samples_bigquery_read_samples",

     

       26
       26
       +
         "bigquery_analyticshub_v1_samples_analytics_hub_client_samples",

     

       27
       27
       +
         "bigquery_biglake_v1_samples_metastore_client_samples",

     

       28
       28
       +
         "bigquery_connection_v1_samples_connection_client_samples",

     

       29
       29
       +
         "bigquery_datapolicies_v1_samples_data_policy_client_samples",

     

       30
       30
       +
         "bigquery_datatransfer_v1_samples_data_transfer_client_samples",

     

       31
       31
       +
         "bigquery_migration_v2_samples_migration_client_samples",

     

       32
       32
       +
         "bigquery_reservation_v1_samples_reservation_client_samples",

     

       33
       33
       +
         "bigquery_storage_v1_samples_bigquery_read_client_samples",

     

       34
       34
       +
         "bigquery_storage_v1_samples_bigquery_write_client_samples",

     

       19
       35
        
         "logging_quickstart",

     

       36
       36
       +
         "logging_v2_samples_config_service_v2_client_samples",

     

       37
       37
       +
         "logging_v2_samples_logging_service_v2_client_samples",

     

       38
       38
       +
         "logging_v2_samples_metrics_service_v2_client_samples",

     

       20
       39
        
         "pubsub_endurance",

     

       21
       21
       -
         "pubsub_schema_admin_integration_test",

     

       40
       40
       +
         "pubsub_throughput",

     

       22
       41
        
         "pubsub_subscriber_integration_test",

     

       23
       42
        
         "pubsub_subscription_admin_integration_test",

     

       24
       24
       -
         "pubsub_throughput",

     

       25
       43
        
         "pubsub_topic_admin_integration_test",

     

       26
       26
       -
         "rest_internal_internal_curl_rest_client_integration_test",

     

       27
       27
       -
         "rest_internal_internal_unified_rest_credentials_integration_test",

     

       28
       28
       -
         "spanner_admin_backup_extra_integration_test",

     

       29
       29
       -
         "spanner_admin_database_admin_integration_test",

     

       30
       30
       -
         "spanner_admin_instance_admin_integration_test",

     

       31
       31
       -
         "spanner_backup_extra_integration_test",

     

       32
       44
        
         "spanner_client_integration_test",

     

       33
       45
        
         "spanner_client_stress_test",

     

       34
       46
        
         "spanner_data_types_integration_test",

     

       35
       47
        
         "spanner_database_admin_integration_test",

     

       36
       48
        
         "spanner_instance_admin_integration_test",

     

       37
       37
       -
         "spanner_multiple_rows_cpu_benchmark",

     

       38
       38
       -
         "spanner_rpc_failure_threshold_integration_test",

     

       39
       49
        
         "spanner_session_pool_integration_test",

     

       50
       50
       +
         "spanner_admin_database_admin_integration_test",

     

       51
       51
       +
         "spanner_admin_instance_admin_integration_test",

     

       52
       52
       +
         "spanner_database_admin_client_samples",

     

       53
       53
       +
         "spanner_instance_admin_client_samples",

     

       54
       54
       +
         "spanner_multiple_rows_cpu_benchmark",

     

       40
       55
        
         "spanner_single_row_throughput_benchmark",

     

       41
       41
       -
         "storage_aggregate_download_throughput_benchmark",

     

       42
       42
       -
         "storage_aggregate_upload_throughput_benchmark",

     

       43
       56
        
         "storage_alternative_endpoint_integration_test",

     

       44
       57
        
         "storage_auto_finalize_integration_test",

     

       45
       58
        
         "storage_bucket_integration_test",

     

       46
       59
        
         "storage_create_client_integration_test",

     

       47
       47
       -
         "storage_create_dataset",

     

       48
       48
       -
         "storage_curl_download_request_integration_test",

     

       49
       49
       -
         "storage_curl_request_integration_test",

     

       50
       50
       -
         "storage_curl_resumable_upload_session_integration_test",

     

       51
       60
        
         "storage_curl_sign_blob_integration_test",

     

       52
       61
        
         "storage_decompressive_transcoding_integration_test",

     

       62
       62
       +
         "storage_grpc_bucket_acl_integration_test",

     

       63
       63
       +
         "storage_grpc_bucket_metadata_integration_test",

     

       64
       64
       +
         "storage_grpc_default_object_acl_integration_test",

     

       53
       65
        
         "storage_grpc_integration_test",

     

       66
       66
       +
         "storage_grpc_object_acl_integration_test",

     

       67
       67
       +
         "storage_grpc_object_media_integration_test",

     

       68
       68
       +
         "storage_grpc_object_metadata_integration_test",

     

       54
       69
        
         "storage_key_file_integration_test",

     

       55
       70
        
         "storage_minimal_iam_credentials_rest_integration_test",

     

       56
       71
        
         "storage_object_basic_crud_integration_test",

     
···

       79
       94
        
         "storage_service_account_integration_test",

     

       80
       95
        
         "storage_signed_url_integration_test",

     

       81
       96
        
         "storage_small_reads_integration_test",

     

       97
       97
       +
         "storage_thread_integration_test",

     

       98
       98
       +
         "storage_tracing_integration_test",

     

       99
       99
       +
         "storage_unified_credentials_integration_test",

     

       100
       100
       +
         "storage_aggregate_download_throughput_benchmark",

     

       101
       101
       +
         "storage_aggregate_upload_throughput_benchmark",

     

       102
       102
       +
         "storage_create_dataset",

     

       82
       103
        
         "storage_storage_file_transfer_benchmark",

     

       83
       104
        
         "storage_storage_parallel_uploads_benchmark",

     

       84
       105
        
         "storage_storage_throughput_vs_cpu_benchmark",

     

       85
       85
       -
         "storage_thread_integration_test",

     

       86
       86
       -
         "storage_throughput_experiment_test",

     

       87
       87
       -
         "storage_tracing_integration_test",

     

       88
       88
       -
         "storage_unified_credentials_integration_test",

     

       106
       106
       +
         "storage_throughput_experiment_test"

     

       89
       107
        
       ]

     

       90
       108
        
       cases = [

     

       91
       109
        
         "BackupExtraIntegrationTest.CreateBackupWithExpiredVersionTime",

+14 -13

pkgs/development/libraries/grpc/default.nix

···

       56
       56
        
           "-DgRPC_PROTOBUF_PROVIDER=package"

     

       57
       57
        
           "-DgRPC_ABSL_PROVIDER=package"

     

       58
       58
        
           "-DBUILD_SHARED_LIBS=ON"

     

       59
       59
       -
           "-DCMAKE_CXX_STANDARD=${passthru.cxxStandard}"

     

       60
       59
        
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       61
       60
        
           "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"

     

       62
       62
       -
         ];

     

       61
       61
       +
         ]

     

       62
       62
       +
         # The build scaffold defaults to c++14 on darwin, even when the compiler uses

     

       63
       63
       +
         # a more recent c++ version by default [1]. However, downgrades are

     

       64
       64
       +
         # problematic, because the compatibility types in abseil will have different

     

       65
       65
       +
         # interface definitions than the ones used for building abseil itself.

     

       66
       66
       +
         # [1] https://github.com/grpc/grpc/blob/v1.57.0/CMakeLists.txt#L239-L243

     

       67
       67
       +
         ++ (let

     

       68
       68
       +
           defaultCxxIsOlderThan17 =

     

       69
       69
       +
             (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.cc.version "16.0")

     

       70
       70
       +
              || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0");

     

       71
       71
       +
           in lib.optionals (stdenv.hostPlatform.isDarwin && defaultCxxIsOlderThan17)

     

       72
       72
       +
         [

     

       73
       73
       +
           "-DCMAKE_CXX_STANDARD=17"

     

       74
       74
       +
         ]);

     

       63
       75
        
       

     

       64
       76
        
         # CMake creates a build directory by default, this conflicts with the

     

       65
       77
        
         # basel BUILD file on case-insensitive filesystems.

     
···

       80
       92
        
           + lib.optionalString stdenv.isAarch64 "-Wno-error=format-security";

     

       81
       93
        
       

     

       82
       94
        
         enableParallelBuilds = true;

     

       83
       83
       -
       

     

       84
       84
       -
         passthru.cxxStandard =

     

       85
       85
       -
           let

     

       86
       86
       -
             # Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is

     

       87
       87
       -
             # only an issue with the useLLVM stdenv, not the darwin stdenv…

     

       88
       88
       -
             # https://github.com/grpc/grpc/issues/26473#issuecomment-860885484

     

       89
       89
       -
             useLLVMAndOldCC = (stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0";

     

       90
       90
       -
             # With GCC 9 (current aarch64-linux) it fails with c++17 but OK with c++14.

     

       91
       91
       -
             useOldGCC = !(stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "10";

     

       92
       92
       -
           in

     

       93
       93
       -
           (if useLLVMAndOldCC then "11" else if useOldGCC then "14" else "17");

     

       94
       95
        
       

     

       95
       96
        
         passthru.tests = {

     

       96
       97
        
           inherit (python3.pkgs) grpcio-status grpcio-tools;

+1 -6

pkgs/top-level/all-packages.nix

···

       21617
       21617
        
       

     

       21618
       21618
        
         grilo-plugins = callPackage ../development/libraries/grilo-plugins { };

     

       21619
       21619
        
       

     

       21620
       21620
       -
         grpc = callPackage ../development/libraries/grpc {

     

       21621
       21621
       -
           # grpc builds with c++17 so abseil must also be built that way

     

       21622
       21622
       -
           abseil-cpp = abseil-cpp_202206.override {

     

       21623
       21623
       -
             cxxStandard = grpc.cxxStandard;

     

       21624
       21624
       -
           };

     

       21625
       21625
       -
         };

     

       21620
       21620
       +
         grpc = callPackage ../development/libraries/grpc { };

     

       21626
       21621
        
       

     

       21627
       21622
        
         gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };

     

       21628
       21623