guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates updated: gnu: sed, diffutils: Patch faulty Gnulib te


From: guix-commits
Subject: branch core-updates updated: gnu: sed, diffutils: Patch faulty Gnulib tests.
Date: Sun, 18 Jul 2021 17:50:15 -0400

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 532b2d9  gnu: sed, diffutils: Patch faulty Gnulib tests.
532b2d9 is described below

commit 532b2d9a381e1b9dfeeb14795db630c23f6b0826
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Jul 18 23:48:14 2021 +0200

    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.
---
 gnu/packages/base.scm         | 5 ++++-
 gnu/packages/commencement.scm | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index b7864f6..08b1e0a 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 fb02839..a04bb83 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]