commit c2720cebe7eacb1b637c1906b4ab6e8c09a0ab98 · pyrox.dev/nixpkgs

+15

pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch

···

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

     

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

     

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

     

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

     

       5
       +
                __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 50000) ||   \

     

       6
       +
               (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) &&      \

     

       7
       +
                __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 120000))))

     

       8
       +
       -#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1

     

       9
       +
       +// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1

     

       10
       +
        #else

     

       11
       +
       -#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0

     

       12
       +
       +// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0

     

       13
       +
        #endif

     

       14
       +
        

     

       15
       +
        // ABSL_HAVE_STD_ANY

+4 -2

pkgs/development/python-modules/tensorflow/default.nix

···

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

     

       312
        
             rm -f .bazelversion

     

       313
        
             patchShebangs .

     

       0
        
       
     

       0
        
       
     

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

     

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

     

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

     
···

       375
        
               then "sha256-SudzMTxfifKJJso6haCgOD2dXeAhYSXHA2nzq1ErTHg="

     

       376
        
               else "sha256-bwZwK24DlUevN5gIdKmBkq1dJpn0i2H4hq+IN77BzjE=";

     

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

     

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

     

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

     

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

     

       381
        
           };

     
···

       424
        
             license = licenses.asl20;

     

       425
        
             maintainers = with maintainers; [ jyp abbradar ];

     

       426
        
             platforms = with platforms; linux ++ darwin;

     

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

     

       428
        
           } // lib.optionalAttrs stdenv.isDarwin {

     

       429
        
             timeout = 86400; # 24 hours

     

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

···

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

     

       312
        
             rm -f .bazelversion

     

       313
        
             patchShebangs .

     

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

     

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

     

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

     

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

     

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

     
···

       377
        
               then "sha256-SudzMTxfifKJJso6haCgOD2dXeAhYSXHA2nzq1ErTHg="

     

       378
        
               else "sha256-bwZwK24DlUevN5gIdKmBkq1dJpn0i2H4hq+IN77BzjE=";

     

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

     

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

     

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

     

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

     

       383
        
           };

     
···

       426
        
             license = licenses.asl20;

     

       427
        
             maintainers = with maintainers; [ jyp abbradar ];

     

       428
        
             platforms = with platforms; linux ++ darwin;

     

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

     

       430
        
           } // lib.optionalAttrs stdenv.isDarwin {

     

       431
        
             timeout = 86400; # 24 hours

     

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