Subject: Re: bug#53350: [PATCH] gnu: zig: Update to 0.9.0

From: Ludovic Courtès <[email-masked]>
Date: Mon, 24 Jan 2022 10:32:55 +0100

Hi Calum,

Calum Irwin <[email-masked]> skribis:

> * gnu/packages/patches/zig-disable-libc-note-test.patch: Move patch changes to new file.
> * gnu/packages/patches/zig-use-system-paths.patch: Update line numbers.
> * gnu/packages/zig.scm: Update to 0.9.0

For some reason I can’t seem to apply it:

--8<---------------cut here---------------start------------->8---
$ git am --show-current-patch=diff|patch -p1
patching file gnu/packages/patches/zig-disable-libc-note-test.patch
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file gnu/packages/patches/zig-disable-libc-note-test.patch.rej
patching file gnu/packages/patches/zig-use-system-paths.patch
patch: **** malformed patch at line 314: -         return self;
--8<---------------cut here---------------end--------------->8---

Could you take a look and resend?

> --- a/gnu/packages/patches/zig-disable-libc-note-test.patch
> +++ b/gnu/packages/patches/zig-disable-libc-note-test.patch
> @@ -1,14 +1,12 @@
> -This test fails with "error.CompilationIncorrectlySucceeded".
> -

[...]

> --- a/gnu/packages/patches/zig-use-system-paths.patch
> +++ b/gnu/packages/patches/zig-use-system-paths.patch
> @@ -1,143 +1,144 @@
> -This patch replaces the OS-specific detection mechanism by one that solely
> -relies on environment variables.  This has the benefit that said environment
> -variables can be used as search paths in Guix.

Also, please preserve those comments at the top of patches.

Thanks in advance,
Ludo’.