public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #129412: makeself: disable tests for now

Browse Source 
Also improve the busybox-sandbox-shell.
(cherry picked from commit 00c86ad14639887ec495b92ada9cd93a75317686)
The makeself problem is blocking the nixos-21.05 channel now.
This commit is contained in:
Vladimír Čunát 2021-07-06 21:07:32 +02:00
parent d3ebf03151
commit 9d1350d9d5
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/makeself/default.nix
View File

@ -12,9 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21"; 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"; checkTarget = "test";
checkInputs = [ which zstd pbzip2 ]; checkInputs = [ which zstd pbzip2 ];
@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
homepage = "http://megastep.org/makeself"; homepage = "https://makeself.io";
description = "Utility to create self-extracting packages"; description = "Utility to create self-extracting packages";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.wmertens ]; maintainers = [ maintainers.wmertens ];

1
pkgs/os-specific/linux/busybox/sandbox-shell.nix
View File

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