guix-commits
[Top][All Lists]
Advanced

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

02/04: gnu: Do not use (gnu packages commencement) in engineering.scm.


From: guix-commits
Subject: 02/04: gnu: Do not use (gnu packages commencement) in engineering.scm.
Date: Thu, 10 Aug 2023 03:45:12 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 66158f535a032137bf0fc88df562defab9cbeb91
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Aug 10 09:23:32 2023 +0200

    gnu: Do not use (gnu packages commencement) in engineering.scm.
    
    This avoids a circular dependency evidenced by the following commit.
    
    * gnu/packages/engineering.scm (freehdl)[inputs]: Resolve
    'gcc-toolchain' from here rather than by using (gnu packages
    commencement).
---
 gnu/packages/engineering.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 79ba1e4536..9fb9658078 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2016, 2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 David Thompson <davet@gnu.org>
-;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016-2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -84,7 +84,6 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages code)
-  #:use-module (gnu packages commencement)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages curl)
@@ -2242,7 +2241,11 @@ parallel computing platforms.  It also supports serial 
execution.")
              #t)))))
     (inputs
      (list coreutils
-           gcc-toolchain
+
+           ;; Lazily resolve the gcc-toolchain to avoid a circular dependency.
+           (module-ref (resolve-interface '(gnu packages commencement))
+                       'gcc-toolchain)
+
            guile-2.2
            perl
            pkg-config



reply via email to

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