diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 4184e3aff02b..221c75112b9b 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -22,6 +22,7 @@ , cudaSupport ? false , cudatoolkit , cudnn +, patchelfUnstable , zlib , python , keras-applications @@ -78,7 +79,8 @@ in buildPythonPackage { ] ++ lib.optional (!isPy3k) mock ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ]; - nativeBuildInputs = [ wheel ] ++ lib.optional cudaSupport addOpenGLRunpath; + # remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default + nativeBuildInputs = [ wheel ] ++ lib.optional cudaSupport [ addOpenGLRunpath patchelfUnstable ]; preConfigure = '' unset SOURCE_DATE_EPOCH diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 01af29ceda41..b43ac71ba41e 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,5 +1,5 @@ { stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin -, addOpenGLRunpath, fetchpatch +, addOpenGLRunpath, fetchpatch, patchelfUnstable # Python deps , buildPythonPackage, pythonOlder, python # Python libraries @@ -465,7 +465,8 @@ in buildPythonPackage { tensorflow-tensorboard ]; - nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + # remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default + nativeBuildInputs = lib.optional cudaSupport [ addOpenGLRunpath patchelfUnstable ]; postFixup = lib.optionalString cudaSupport '' find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index dd7f4ac881b4..740015dbe984 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "patchelf-${version}"; - version = "2020-07-11"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "126372b636733b160e693c9913e871f6755c02e"; - sha256 = "07cn40ypys5pyc3jfgxvqj7qk5v6m2rr5brnpmxdsl1557ryx226"; + rev = "a174cf3006baf31e0e9eaa62bc9adead93af63f7"; + sha256 = "sha256-cKZ4DE70R5XiIqfnIVAl2s7a1bJxaaPpuCmxs3pxFRU="; }; # Drop test that fails on musl (?) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bca527f6db07..04d93593c3d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9229,15 +9229,15 @@ in { tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; - cudatoolkit = pkgs.cudatoolkit_11_0; - cudnn = pkgs.cudnn_cudatoolkit_11_0; + cudatoolkit = pkgs.cudatoolkit_11_2; + cudnn = pkgs.cudnn_cudatoolkit_11_2; }; tensorflow-build = callPackage ../development/python-modules/tensorflow { inherit (pkgs.darwin) cctools; cudaSupport = pkgs.config.cudaSupport or false; - cudatoolkit = pkgs.cudatoolkit_11_0; - cudnn = pkgs.cudnn_cudatoolkit_11_0; + cudatoolkit = pkgs.cudatoolkit_11_2; + cudnn = pkgs.cudnn_cudatoolkit_11_2; nccl = pkgs.nccl_cudatoolkit_11; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers;