ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 20:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Do not eagerly load (gnu packages commencement).

Browse source 
As its top comment says, this module is not meant to be imported to avoid
circular module dependencies.

* gnu/packages/chicken.scm (chicken) [propagated-inputs]: Resolve
gcc-toolchain lazily.
* gnu/packages/plan9.scm (plan9port): Likewise.
* gnu/packages/raspberry-pi.scm (raspi-arm64-chainloader)
[native-inputs]: Resolve ld-wrapper lazily.

Change-Id: Ie9859046ed32b67dc53bcc5444d6ae162e5d4022
This commit is contained in:
Maxim Cournoyer 2024-01-31 00:07:06 -05:00 committed by Ludovic Courtès
parent a9bd08f8f5
commit 84728d5ba4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/chicken.scm
View file

@ -26,7 +26,6 @@ (define-module (gnu packages chicken)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix svn-download) #:use-module (guix svn-download)
#:use-module (gnu packages commencement)
#:use-module ((guix licenses) #:use-module ((guix licenses)
#:prefix license:)) #:prefix license:))
@ -68,7 +67,11 @@ (define-public chicken
(variable "CHICKEN_REPOSITORY_PATH") (variable "CHICKEN_REPOSITORY_PATH")
;; TODO extract binary version into a module level definition. ;; TODO extract binary version into a module level definition.
(files (list "var/lib/chicken/11"))))) (files (list "var/lib/chicken/11")))))
(propagated-inputs (list gcc-toolchain)) ;; Reference gcc-toolchain lazily to avoid circular module dependency
;; problems.
(propagated-inputs (list (module-ref (resolve-interface
'(gnu packages commencement))
'gcc-toolchain)))
(home-page "https://www.call-cc.org/") (home-page "https://www.call-cc.org/")
(synopsis "R5RS Scheme implementation that compiles native code via C") (synopsis "R5RS Scheme implementation that compiles native code via C")
(description (description

5
gnu/packages/plan9.scm
View file

@ -26,7 +26,6 @@ (define-module (gnu packages plan9)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages commencement)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
@ -180,7 +179,9 @@ (define-public plan9port
fontconfig libx11 libxext libxt)) fontconfig libx11 libxext libxt))
;; Propagate gcc-toolchain because some programs, like the 9c compiler, ;; Propagate gcc-toolchain because some programs, like the 9c compiler,
;; are just aliased scripts to gcc equivalents. ;; are just aliased scripts to gcc equivalents.
(propagated-inputs (list gcc-toolchain)) (propagated-inputs (list (module-ref (resolve-interface
'(gnu packages commencement))
'gcc-toolchain)))
(home-page "https://9fans.github.io/plan9port/") (home-page "https://9fans.github.io/plan9port/")
(synopsis "Port of many Plan 9 libraries and programs") (synopsis "Port of many Plan 9 libraries and programs")
(description (description

5
gnu/packages/raspberry-pi.scm
View file

@ -28,7 +28,6 @@ (define-module (gnu packages raspberry-pi)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages bootloaders) #:use-module (gnu packages bootloaders)
#:use-module (gnu packages commencement)
#:use-module (gnu packages cross-base) #:use-module (gnu packages cross-base)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
@ -196,7 +195,9 @@ (define-public raspi-arm64-chainloader
("binutils" ,binutils) ("binutils" ,binutils)
("coreutils" ,coreutils) ("coreutils" ,coreutils)
("file" ,file) ("file" ,file)
("ld-wrapper" ,ld-wrapper) ("ld-wrapper" ,(module-ref (resolve-interface
'(gnu packages commencement))
'ld-wrapper))
("make" ,gnu-make) ("make" ,gnu-make)
("gcc" ,gcc-6) ("gcc" ,gcc-6)
("locales" ,(libc-utf8-locales-for-target)))) ("locales" ,(libc-utf8-locales-for-target))))