From 9d1350d9d56411b685ff3de5839ed6728b1bf808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 6 Jul 2021 21:07:32 +0200 Subject: [PATCH] Merge #129412: makeself: disable tests for now Also improve the busybox-sandbox-shell. (cherry picked from commit 00c86ad14639887ec495b92ada9cd93a75317686) The makeself problem is blocking the nixos-21.05 channel now. --- pkgs/applications/misc/makeself/default.nix | 9 ++++++--- pkgs/os-specific/linux/busybox/sandbox-shell.nix | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index e60e110087f..12d4f62a783 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21"; }; - patchPhase = "patchShebangs test"; + 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 ]; @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://megastep.org/makeself"; + homepage = "https://makeself.io"; description = "Utility to create self-extracting packages"; license = licenses.gpl2; maintainers = [ maintainers.wmertens ]; diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix index f5db0b25f18..fa70e5f91d8 100644 --- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix +++ b/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