guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: flex: Build bison-for-tests sequentially.


From: guix-commits
Subject: 01/02: gnu: flex: Build bison-for-tests sequentially.
Date: Sat, 29 Jun 2019 17:08:20 -0400 (EDT)

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

commit 06172df545f1253463bc51a9e2c39bf2133f3f23
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jun 29 22:34:20 2019 +0200

    gnu: flex: Build bison-for-tests sequentially.
    
    This is a followup to b1593c1c4fd8f4fc6df4c43cab51334426e3aa76.
    
    * gnu/packages/flex.scm (flex)[inputs](bison-for-tests): Use
    'substitute-keyword-arguments' instead of overriding them altogether.
    This ensures that #:parallel-build? and #:parallel-tests? are
    preserved.
---
 gnu/packages/flex.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm
index e08b0c1..6038e92 100644
--- a/gnu/packages/flex.scm
+++ b/gnu/packages/flex.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2019 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -22,6 +22,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages man)
@@ -47,8 +48,10 @@
      (let ((bison-for-tests
             (package
               (inherit bison)
-              ;; Disable tests, since they require flex.
-              (arguments '(#:tests? #f))
+              (arguments
+               ;; Disable tests, since they require flex.
+               (substitute-keyword-arguments (package-arguments bison)
+                 ((#:tests? _ #f) #f)))
               (inputs (alist-delete "flex" (package-inputs bison))))))
        `(("bison" ,bison-for-tests)
          ("indent" ,indent))))



reply via email to

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