Merge #129412: makeself: disable tests for now

pkgs/applications/misc/makeself/default.nix

@@ -12,10 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21";
   };
 
-  patches = [ ./tests-use-better-shell.patch ];
   postPatch = "patchShebangs test";
 
-  doCheck = true;
+  # Issue #110149: our default /bin/sh apparently has 32-bit math only
+  # (attribute busybox-sandbox-shell), and that causes problems
+  # when running these tests inside build, based on free disk space.
+  doCheck = false;
   checkTarget = "test";
   checkInputs = [ which zstd pbzip2 ];
 

pkgs/applications/misc/makeself/tests-use-better-shell.patch

@@ -1,10 +0,0 @@
-Use full bash's sh in tests instead of /bin/sh, as that would be
-too minimalist in the build sandbox.  See issue:
-https://github.com/NixOS/nixpkgs/issues/110149#issuecomment-874258128
-diff --git a/test/extracttest b/test/extracttest
---- a/test/extracttest
-+++ b/test/extracttest
-@@ -9,2 +9,3 @@ setupTests() {
-   $SUT $* archive makeself-test.run "Test $*" echo Testing
-+  sed "1s|/bin|$(dirname "$SHELL")|" -i ./makeself-test.run
- }

pkgs/os-specific/linux/busybox/sandbox-shell.nix

@@ -8,6 +8,7 @@ busybox.override {
     CONFIG_FEATURE_FANCY_ECHO y
     CONFIG_FEATURE_SH_MATH y
     CONFIG_FEATURE_SH_MATH_64 y
+    CONFIG_FEATURE_TEST_64 y
 
     CONFIG_ASH y
     CONFIG_ASH_OPTIMIZE_FOR_SIZE y