···

       
1
       
1
       
+
       
diff -ru a/absl/base/config.h b/absl/base/config.h

     

       
2
       
2
       
+
       
--- a/absl/base/config.h

     

       
3
       
3
       
+
       
+++ b/absl/base/config.h

     

       
4
       
4
       
+
       
@@ -558,9 +558,9 @@

     

       
5
       
5
       
+
       
         __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 50000) ||   \

     

       
6
       
6
       
+
       
        (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) &&      \

     

       
7
       
7
       
+
       
         __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 120000))))

     

       
8
       
8
       
+
       
-#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1

     

       
9
       
9
       
+
       
+// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1

     

       
10
       
10
       
+
       
 #else

     

       
11
       
11
       
+
       
-#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0

     

       
12
       
12
       
+
       
+// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0

     

       
13
       
13
       
+
       
 #endif

     

       
14
       
14
       
+
       
 

     

       
15
       
15
       
+
       
 // ABSL_HAVE_STD_ANY

     

···

       
311
       
311
       
 
       
      # bazel 3.3 should work just as well as bazel 3.1

     

       
312
       
312
       
 
       
      rm -f .bazelversion

     

       
313
       
313
       
 
       
      patchShebangs .

     

       
314
       
314
       
+
       
    '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") ''

     

       
315
       
315
       
+
       
      cat ${./com_google_absl_fix_macos.patch} >> third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch

     

       
314
       
316
       
 
       
    '' + lib.optionalString (!withTensorboard) ''

     

       
315
       
317
       
 
       
      # Tensorboard pulls in a bunch of dependencies, some of which may

     

       
316
       
318
       
 
       
      # include security vulnerabilities. So we make it optional.

     
···

       
375
       
377
       
 
       
        then "sha256-SudzMTxfifKJJso6haCgOD2dXeAhYSXHA2nzq1ErTHg="

     

       
376
       
378
       
 
       
        else "sha256-bwZwK24DlUevN5gIdKmBkq1dJpn0i2H4hq+IN77BzjE=";

     

       
377
       
379
       
 
       
      aarch64-linux = "sha256-ZbCNZSHF9of+KGTNEqFdKQ44MVNto/rTyo2XEsKXISg=";

     

       
378
       
378
       
-
       
      x86_64-darwin = "sha256-/qPUDgfKsWCZh/pgZM4wm9+4U9U5kxxv7q3Uh7zKSO4=";

     

       
380
       
380
       
+
       
      x86_64-darwin = "sha256-ZfZQjLdqo8VVlfKfkdolvSHQvKe4IbQSLc/4cNzHr3E=";

     

       
379
       
381
       
 
       
      aarch64-darwin = "sha256-u+ODHAZDlGe06PUWId4sNKyl60vhAPMd01jMm2EvN8E=";

     

       
380
       
382
       
 
       
      }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");

     

       
381
       
383
       
 
       
    };

     
···

       
424
       
426
       
 
       
      license = licenses.asl20;

     

       
425
       
427
       
 
       
      maintainers = with maintainers; [ jyp abbradar ];

     

       
426
       
428
       
 
       
      platforms = with platforms; linux ++ darwin;

     

       
427
       
427
       
-
       
      broken = !(xlaSupport -> cudaSupport) || (stdenv.hostPlatform.system == "x86_64-darwin");

     

       
429
       
429
       
+
       
      broken = !(xlaSupport -> cudaSupport);

     

       
428
       
430
       
 
       
    } // lib.optionalAttrs stdenv.isDarwin {

     

       
429
       
431
       
 
       
      timeout = 86400; # 24 hours

     

       
430
       
432
       
 
       
      maxSilent = 14400; # 4h, double the default of 7200s