From 66158f535a032137bf0fc88df562defab9cbeb91 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 10 Aug 2023 09:23:32 +0200 Subject: 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(-) (limited to 'gnu/packages/engineering.scm') 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 ;;; Copyright © 2016, 2018, 2020-2023 Efraim Flashner ;;; Copyright © 2016 David Thompson -;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ludovic Courtès +;;; Copyright © 2016-2019, 2021, 2023 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice @@ -84,7 +84,6 @@ (define-module (gnu packages engineering) #: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 @@ (define-public freehdl #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 -- cgit v1.2.3