nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Remove '%final-inputs' references at the top level. 

Due to circular dependencies, referring to bindings exported by other
modules from the top level is frowned upon.  This patch addresses one of
the remaining cases.

* gnu/packages/base.scm (%final-inputs): New procedure.
* gnu/packages/cross-base.scm: Remove (gnu packages commencement) import.
(cross-gcc): Use the new '%final-inputs'.
* gnu/packages/make-bootstrap.scm: Remove (gnu packages commencement) import.
(package-with-relocatable-glibc): Use the new '%final-inputs'.
This commit is contained in:
Ludovic Courtès 2016-11-04 15:16:11 +01:00
parent 8af47ef603
commit fb77c61422
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/base.scm
View File

@ -1003,4 +1003,10 @@ program. It supports a wide variety of different encodings.")
(proc (module-ref iface 'canonical-package))) (proc (module-ref iface 'canonical-package)))
(proc package))) (proc package)))
(define-public (%final-inputs)
"Return the list of \"final inputs\"."
;; Avoid circular dependency by lazily resolving 'commencement'.
(let ((iface (resolve-interface '(gnu packages commencement))))
(module-ref iface '%final-inputs)))
;;; base.scm ends here ;;; base.scm ends here

5
gnu/packages/cross-base.scm
View File

@ -23,7 +23,6 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages commencement)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -257,11 +256,11 @@ GCC that does not target a libc; otherwise, target that libc."
;; Call it differently so that the builder can check whether the "libc" ;; Call it differently so that the builder can check whether the "libc"
;; input is #f. ;; input is #f.
("libc-native" ,@(assoc-ref %final-inputs "libc")) ("libc-native" ,@(assoc-ref (%final-inputs) "libc"))
;; Remaining inputs. ;; Remaining inputs.
,@(let ((inputs (append (package-inputs %xgcc) ,@(let ((inputs (append (package-inputs %xgcc)
(alist-delete "libc" %final-inputs)))) (alist-delete "libc" (%final-inputs)))))
(if libc (if libc
`(("libc" ,libc) `(("libc" ,libc)
("xkernel-headers" ;the target headers ("xkernel-headers" ;the target headers

5
gnu/packages/make-bootstrap.scm
View File

@ -23,7 +23,6 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((gnu packages) #:select (search-patch)) #:use-module ((gnu packages) #:select (search-patch))
#:use-module ((gnu packages commencement) #:select (%final-inputs))
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages cross-base) #:use-module (gnu packages cross-base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
@ -101,14 +100,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(cross-binutils target) (cross-binutils target)
(cross-bootstrap-libc))) (cross-bootstrap-libc)))
("cross-binutils" ,(cross-binutils target)) ("cross-binutils" ,(cross-binutils target))
,@%final-inputs)) ,@(%final-inputs)))
`(("libc" ,(glibc-for-bootstrap)) `(("libc" ,(glibc-for-bootstrap))
("gcc" ,(package (inherit gcc) ("gcc" ,(package (inherit gcc)
(outputs '("out")) ; all in one so libgcc_s is easily found (outputs '("out")) ; all in one so libgcc_s is easily found
(inputs (inputs
`(("libc",(glibc-for-bootstrap)) `(("libc",(glibc-for-bootstrap))
,@(package-inputs gcc))))) ,@(package-inputs gcc)))))
,@(fold alist-delete %final-inputs '("libc" "gcc"))))) ,@(fold alist-delete (%final-inputs) '("libc" "gcc")))))
(package-with-explicit-inputs p inputs (package-with-explicit-inputs p inputs
(current-source-location) (current-source-location)