From 6c251ae60b13243423a48bfae4100546cdd27e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Nov 2022 22:56:22 -0800 Subject: [PATCH] bazel_5: only use python3 --- .../build-managers/bazel/bazel_5/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 491a02d74d0d..7b2bef113b33 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -7,7 +7,7 @@ , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater -, python27, python3, writeScript +, python3, writeScript # Apple dependencies , cctools, libcxx, sigtool, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively @@ -100,10 +100,6 @@ let # "@bison//:bin/bison", # ], # ) - # - # Some of the scripts explicitly depend on Python 2.7. Otherwise, we - # default to using python3. Therefore, both python27 and python3 are - # runtime dependencies. [ bash coreutils @@ -114,7 +110,6 @@ let gnused gnutar gzip - python27 python3 unzip which @@ -393,11 +388,9 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute j2objc and objc wrapper's python shebang to plain python path. - # These scripts explicitly depend on Python 2.7, hence we use python27. - # See also `postFixup` where python27 is added to $out/nix-support - substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" + substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" + substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}" # md5sum is part of coreutils sed -i 's|/sbin/md5|md5sum|g' \ @@ -414,8 +407,6 @@ stdenv.mkDerivation rec { grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. - # We default to python3 where possible. See also `postFixup` where - # python3 is added to $out/nix-support substituteInPlace "$path" \ --replace /bin/bash ${bash}/bin/bash \ --replace "/usr/bin/env bash" ${bash}/bin/bash \ @@ -426,7 +417,7 @@ stdenv.mkDerivation rec { grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ - --replace "/usr/bin/env python2" ${python27}/bin/python \ + --replace "/usr/bin/env python2" ${python3.interpreter} \ --replace "/usr/bin/env python3" ${python3}/bin/python \ --replace /usr/bin/env ${coreutils}/bin/env done