diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 23:48:14 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 23:48:14 +0200 |
| commit | 532b2d9a381e1b9dfeeb14795db630c23f6b0826 (patch) | |
| tree | fd326314c6884bd054e9b704eb9016a73f4c6fd2 | |
| parent | f186365aee5a894e3cc26fa64af573e264c38ff6 (diff) | |
| download | guix-532b2d9a381e1b9dfeeb14795db630c23f6b0826.tar.gz | |
gnu: sed, diffutils: Patch faulty Gnulib tests.
This is a followup to c823b958256ba1db6cf896400fae218e4261266e, fixing tests for sed and diffutils on armhf-linux. * gnu/packages/base.scm (sed)[source]: Add "coreutils-gnulib-tests.patch". (diffutils)[source]: Likewise. * gnu/packages/commencement.scm (diffutils-boot0)[source]: New field.
| -rw-r--r-- | gnu/packages/base.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/commencement.scm | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index b7864f67fe..08b1e0a686 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -148,6 +148,8 @@ including, for example, recursive directory searching.") (sha256 (base32 "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")) + (patches (search-patches "coreutils-gnulib-tests.patch")) + ;; Remove this snippet once upstream releases a fixed version. ;; This snippet changes Makefile.in, even though the upstream ;; patch changes testsuite/local.mk, since we build sed from a @@ -269,7 +271,8 @@ differences.") version ".tar.xz")) (sha256 (base32 - "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk")))) + "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk")) + (patches (search-patches "coreutils-gnulib-tests.patch")))) (build-system gnu-build-system) (native-inputs (list perl)) (synopsis "Comparing and merging files") diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index fb028390a2..a04bb83c3d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2474,6 +2474,9 @@ exec " gcc "/bin/" program (package (inherit diffutils) (name "diffutils-boot0") + (source (origin + (inherit (package-source diffutils)) + (patches '()))) ;patches for tests unneeded here (native-inputs `()) (inputs `(("make" ,gnu-make-boot0) |