bug#39156: closed ([PATCH] gnu: nim: Fix substitution in stdlib_osproc.c)

[GNU bug Tracking System]

Your message dated Tue, 21 Jan 2020 21:30:08 +0100
with message-id <87lfq0a6y7.fsf@nckx>
and subject line Re: [bug#39156] [PATCH] gnu: nim: Fix substitution in 
stdlib_osproc.c
has caused the debbugs.gnu.org bug report #39156,
regarding [PATCH] gnu: nim: Fix substitution in stdlib_osproc.c
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
39156: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=39156
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: nim: Fix substitution in stdlib_osproc.c
>
>
>
>
> Date: 
>
> Thu, 16 Jan 2020 23:14:41 +0100
>
>
>
>
> * gnu/packages/nim.scm (nim)[arguments](patch-more-shebangs): Patch the
>   string length too.
> ---
>  gnu/packages/nim.scm | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm
> index 5694eae63b..22dac0b58a 100644
> --- a/gnu/packages/nim.scm
> +++ b/gnu/packages/nim.scm
> @@ -50,10 +50,12 @@
>                   #t)))
>             (add-after 'patch-source-shebangs 'patch-more-shebangs
>               (lambda _
> -               (substitute* (append '("tests/stdlib/tosprocterminate.nim"
> -                                      "lib/pure/osproc.nim")
> -                                    (find-files "c_code" "stdlib_osproc.c"))
> -                 (("/bin/sh") (which "sh")))
> +               (let ((sh (which "sh")))
> +                 (substitute* '("tests/stdlib/tosprocterminate.nim"
> +                                        "lib/pure/osproc.nim")
> +                   (("/bin/sh") sh))
> +                 (substitute* (find-files "c_code" "stdlib_osproc.c")
> +                   (("\"/bin/sh\", 7") (format "~s, ~s" sh (string-length 
> sh)))))
>                 #t))
>             (replace 'build
>               (lambda _
> -- 
> 2.24.1
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#39156] [PATCH] gnu: nim: Fix substitution in stdlib_osproc.c Date: Tue, 21 Jan 2020 21:30:08 +0100

Jakub,

Jakub Kądziołka 写道：

* gnu/packages/nim.scm (nim)[arguments](patch-more-shebangs): Patch the

  string length too.

Thanks!  Pushed as 79e074ea10875ff75ca613179c70de12d64b19f5.

I tweaked only the commit message a bit, removing the unconventional ‘(patch-more-shebangs)’. Now I see that Ludo' didn't seem to mind in 489703898380ab1a0db86f82c4861a33bf97b5fd. Oh well.

Kind regards,

T G-R

signature.asc
Description: PGP signature

--- End Message ---