backport 364050: Update armv5 and armv6 bootstrap tools

backport ffe685b..0970fc9

#364050

pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix

@@ -1,18 +1,21 @@
+# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as:
+# $ ./refresh-tarballs.bash --targets=armv5tel-unknown-linux-gnueabi
+#
+# Metadata:
+# - nixpkgs revision: 029dea9aaacf920ce8f7d89e4cf09da31a38d8e1
+# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel-unknown-linux-gnueabi.build/latest
+# - resolved hydra build: https://hydra.nixos.org/build/281086357
+# - instantiated derivation: /nix/store/j44ipis8k634n1a6j9j1blff88w13ix9-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi.drv
+# - output directory: /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi
+# - build time: Tue, 03 Dec 2024 13:59:40 +0000
 {
-  # Note: do not use Hydra as a source URL. Ask a member of the
-  # infrastructure team to mirror the job.
+  bootstrapTools = import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/bootstrap-tools.tar.xz";
+    hash = "sha256-+7cdKUThhOb4pVFBjPWFpBbTfn64A/ezkZnP6hEhMRM=";
+  };
   busybox = import <nix/fetchurl.nix> {
-    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
-    # from build: https://hydra.nixos.org/build/114203025
-    url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox";
-    # note: the following hash is different than the above hash, due to executable = true
-    sha256 = "0qxp2fsvs4phbc17g9npj9bsm20ylr8myi5pivcrmxm5qqflgi8d";
+    url = "http://tarballs.nixos.org/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/busybox";
+    hash = "sha256-vZ3oSKUjGVcx2TJsrKmTX4d+3S4/flD780vFVaaHDGI=";
     executable = true;
   };
-  bootstrapTools = import <nix/fetchurl.nix> {
-    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
-    # from build: https://hydra.nixos.org/build/114203025
-    url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz";
-    sha256 = "28327343db5ecc7f7811449ec69280d5867fa5d1d377cab0426beb9d4e059ed6";
-  };
 }

pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix

@@ -1,18 +1,21 @@
+# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as:
+# $ ./refresh-tarballs.bash --targets=armv6l-unknown-linux-gnueabihf
+#
+# Metadata:
+# - nixpkgs revision: 029dea9aaacf920ce8f7d89e4cf09da31a38d8e1
+# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l-unknown-linux-gnueabihf.build/latest
+# - resolved hydra build: https://hydra.nixos.org/build/281086894
+# - instantiated derivation: /nix/store/gq29b3av5mf7x9zlbvaf1qrvlnb1ps4l-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf.drv
+# - output directory: /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf
+# - build time: Tue, 03 Dec 2024 13:59:47 +0000
 {
-  # Note: do not use Hydra as a source URL. Ask a member of the
-  # infrastructure team to mirror the job.
+  bootstrapTools = import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/bootstrap-tools.tar.xz";
+    hash = "sha256-IOZRTJRvoP0bIz5GI6GqGAYb/FdME+xVVyFTvgtmLuw=";
+  };
   busybox = import <nix/fetchurl.nix> {
-    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
-    # from build: https://hydra.nixos.org/build/114202834
-    url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox";
-    # note: the following hash is different than the above hash, due to executable = true
-    sha256 = "1q02537cq56wlaxbz3s3kj5vmh6jbm27jhvga6b4m4jycz5sxxp6";
+    url = "http://tarballs.nixos.org/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/busybox";
+    hash = "sha256-kdlAOhgypLa+ZesRT1ZVDoDQdNefV1Rx5Yf7H254o80=";
     executable = true;
   };
-  bootstrapTools = import <nix/fetchurl.nix> {
-    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
-    # from build: https://hydra.nixos.org/build/114202834
-    url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz";
-    sha256 = "0810fe74f8cd09831f177d075bd451a66b71278d3cc8db55b07c5e38ef3fbf3f";
-  };
 }

pkgs/tools/text/diffutils/default.nix

@@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
   # Disable stack-related gnulib tests on x86_64-darwin because they have problems running under
   # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow fails.
   postPatch =
-    if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then
+    if
+      ((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32))
+    then
       ''
         sed -i -E 's:test-c-stack2?\.sh::g' gnulib-tests/Makefile.in
         sed -i -E 's:test-sigsegv-catch-stackoverflow[12]::g' gnulib-tests/Makefile.in

pkgs/tools/text/gnugrep/default.nix

@@ -32,7 +32,8 @@ stdenv.mkDerivation {
   # cygwin: FAIL: multibyte-white-space
   # freebsd: FAIL mb-non-UTF8-performance
   # x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator
-  doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64;
+  # aarch32: fails 'stack-overflow' when run on qemu under x86_64
+  doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64 && !stdenv.hostPlatform.isAarch32;
 
   # On macOS, force use of mkdir -p, since Grep's fallback
   # (./install-sh) is broken.