git.iko.soy/typeable/nixpkgs
on master help sign in
parallel: fix calculation of max line length

parallel >= 20200822 uses /bin/echo to calculate the max allowed line length. Patch it to a correct path, so that it doesn't (silently) fail and fall back to a low value of 324. Before: $ parallel --max-line-length-allowed 324 After: $ parallel --max-line-length-allowed 131063 Fixes: 16ca8725ff ("parallel: 20200722 -> 20200822")

commit3d4e133e7724e1376ff9310b9949c4c372410c65 authorBjørn Forsman <bjorn.forsman@gmail.com> dateFri 23 Oct 2020, 17:12 (6 years ago) parentc0a646e
2 files changed+26−1
pkgs/tools/misc/parallel/default.nix+9−1 pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff+17
pkgs/tools/misc/parallel/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, perl, makeWrapper, procps }:
1+{ fetchurl, stdenv, perl, makeWrapper, procps, coreutils }:
22
33stdenv.mkDerivation rec {
44 name = "parallel-20200822";
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
88 sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n";
99 };
1010
11+ patches = [
12+ ./fix-max-line-length-allowed.diff
13+ ];
14+
15+ postPatch = ''
16+ substituteInPlace src/parallel --subst-var-by coreutils ${coreutils}
17+ '';
18+
1119 outputs = [ "out" "man" ];
1220
1321 nativeBuildInputs = [ makeWrapper ];
pkgs/tools/misc/parallel/fix-max-line-length-allowed.diffnew file+17
@@ -0,0 +1,17 @@
1+Correct path to coreutils echo to fix parallel --max-line-length-allowed.
2+
3+Author: Bjørn Forsman
4+
5+diff --git a/src/parallel b/src/parallel
6+index a047fd94..9fc5f671 100755
7+--- a/src/parallel
8++++ b/src/parallel
9+@@ -11580,7 +11580,7 @@ sub is_acceptable_command_line_length($$) {
10+ $len += length $Global::parallel_env;
11+ }
12+ # Force using non-built-in command
13+- ::qqx("/bin/echo ".${string}x(($len-length "/bin/echo ")/length $string));
14++ ::qqx("@coreutils@/bin/echo ".${string}x(($len-length "@coreutils@/bin/echo ")/length $string));
15+ ::debug("init", "$len=$? ");
16+ return not $?;
17+ }