TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packages: Call 'bag-grafts' only on the tip of the package graph. 

This reinstates pre-gexp behavior where 'expand-input' would explicitly
pass #:graft? #f in recursive calls, thereby preventing redundant calls
to 'bag-grafts'.

* guix/packages.scm (expand-input): Turn into a monadic procedure.
Lower INPUT when it's a package, passing #:graft? #f.
(bag->derivation, bag->cross-derivation): Adjust accordingly.
* tests/packages.scm ("search paths"): Adjust so BUILD aborts only when
passed the package of interest.
This commit is contained in:
Ludovic Courtès 2021-03-07 15:22:29 +01:00
parent e7477dd59b
commit 89b0c2390a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 98 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
guix/packages.scm
View File

@ -1210,25 +1210,45 @@ Return the cached result when available."
(#f
(cache! cache package key thunk)))))))
(define* (expand-input package input #:key native?)
(define* (expand-input package input #:key target)
"Expand INPUT, an input tuple, to a name/<gexp-input> tuple. PACKAGE is
only used to provide contextual information in exceptions."
(match input
(((? string? name) (? file-like? thing))
(list name (gexp-input thing #:native? native?)))
(((? string? name) (? file-like? thing) (? string? output))
(list name (gexp-input thing output #:native? native?)))
(((? string? name)
(and (? string?) (? file-exists? file)))
;; Add FILE to the store. When FILE is in the sub-directory of a
;; store path, it needs to be added anyway, so it can be used as a
;; source.
(list name (gexp-input (local-file file #:recursive? #t)
#:native? native?)))
(x
(raise (condition (&package-input-error
(package package)
(input x)))))))
(with-monad %store-monad
(match input
;; INPUT doesn't need to be lowered here because it'll be lowered down
;; the road in the gexp that refers to it. However, packages need to be
;; special-cased to pass #:graft? #f (only the "tip" of the package
;; graph needs to have #:graft? #t). Lowering them here also allows
;; 'bag->derivation' to delete non-eq? packages that lead to the same
;; derivation.
(((? string? name) (? package? package))
(mlet %store-monad ((drv (if target
(package->cross-derivation package target
#:graft? #f)
(package->derivation package #:graft? #f))))
(return (list name (gexp-input drv #:native? (not target))))))
(((? string? name) (? package? package) (? string? output))
(mlet %store-monad ((drv (if target
(package->cross-derivation package target
#:graft? #f)
(package->derivation package #:graft? #f))))
(return (list name (gexp-input drv output #:native? (not target))))))
(((? string? name) (? file-like? thing))
(return (list name (gexp-input thing #:native? (not target)))))
(((? string? name) (? file-like? thing) (? string? output))
(return (list name (gexp-input thing output #:native? (not target)))))
(((? string? name)
(and (? string?) (? file-exists? file)))
;; Add FILE to the store. When FILE is in the sub-directory of a
;; store path, it needs to be added anyway, so it can be used as a
;; source.
(return (list name (gexp-input (local-file file #:recursive? #t)
#:native? (not target)))))
(x
(raise (condition (&package-input-error
(package package)
(input x))))))))
(define %bag-cache
;; 'eq?' cache mapping packages to system+target+graft?-dependent bags.
@ -1438,17 +1458,18 @@ a package object describing the context in which the call occurs, for improved
error reporting."
(if (bag-target bag)
(bag->cross-derivation bag)
(let* ((system (bag-system bag))
(inputs (bag-transitive-inputs bag))
(input-drvs (map (cut expand-input context <> #:native? #t)
inputs))
(paths (delete-duplicates
(append-map (match-lambda
((_ (? package? p) _ ...)
(package-native-search-paths
p))
(_ '()))
inputs))))
(mlet* %store-monad ((system -> (bag-system bag))
(inputs -> (bag-transitive-inputs bag))
(input-drvs (mapm %store-monad
(cut expand-input context <>)
inputs))
(paths -> (delete-duplicates
(append-map (match-lambda
((_ (? package? p) _ ...)
(package-native-search-paths
p))
(_ '()))
inputs))))
;; It's possible that INPUTS contains packages that are not 'eq?' but
;; that lead to the same derivation. Delete those duplicates to avoid
;; issues down the road, such as duplicate entries in '%build-inputs'.
@ -1462,31 +1483,35 @@ error reporting."
"Return the derivation to build BAG, which is actually a cross build.
Optionally, CONTEXT can be a package object denoting the context of the call.
This is an internal procedure."
(let* ((system (bag-system bag))
(target (bag-target bag))
(host (bag-transitive-host-inputs bag))
(host-drvs (map (cut expand-input context <> #:native? #f)
host))
(target* (bag-transitive-target-inputs bag))
(target-drvs (map (cut expand-input context <> #:native? #t)
target*))
(build (bag-transitive-build-inputs bag))
(build-drvs (map (cut expand-input context <> #:native? #t)
build))
(all (append build target* host))
(paths (delete-duplicates
(append-map (match-lambda
((_ (? package? p) _ ...)
(package-search-paths p))
(_ '()))
all)))
(npaths (delete-duplicates
(append-map (match-lambda
((_ (? package? p) _ ...)
(package-native-search-paths
p))
(_ '()))
all))))
(mlet* %store-monad ((system -> (bag-system bag))
(target -> (bag-target bag))
(host -> (bag-transitive-host-inputs bag))
(host-drvs (mapm %store-monad
(cut expand-input context <>
#:target target)
host))
(target* -> (bag-transitive-target-inputs bag))
(target-drvs (mapm %store-monad
(cut expand-input context <>)
target*))
(build -> (bag-transitive-build-inputs bag))
(build-drvs (mapm %store-monad
(cut expand-input context <>)
build))
(all -> (append build target* host))
(paths -> (delete-duplicates
(append-map (match-lambda
((_ (? package? p) _ ...)
(package-search-paths p))
(_ '()))
all)))
(npaths -> (delete-duplicates
(append-map (match-lambda
((_ (? package? p) _ ...)
(package-native-search-paths
p))
(_ '()))
all))))
(apply (bag-build bag) (bag-name bag)
#:build-inputs (delete-duplicates build-drvs input=?)

34
tests/packages.scm
View File

@ -858,19 +858,23 @@
(test-assert "search paths"
(let* ((p (make-prompt-tag "return-search-paths"))
(t (make-parameter "guile-0"))
(s (build-system
(name 'raw)
(description "Raw build system with direct store access")
(lower (lambda* (name #:key source inputs system target
#:allow-other-keys)
(bag
(name name)
(system system) (target target)
(build-inputs inputs)
(build
(lambda* (name inputs
#:key outputs system search-paths)
(abort-to-prompt p search-paths))))))))
(name 'raw)
(description "Raw build system with direct store access")
(lower (lambda* (name #:key source inputs system target
#:allow-other-keys)
(bag
(name name)
(system system) (target target)
(build-inputs inputs)
(build
(lambda* (name inputs
#:key outputs system search-paths)
(if (string=? name (t))
(abort-to-prompt p search-paths)
(gexp->derivation name
#~(mkdir #$output))))))))))
(x (list (search-path-specification
(variable "GUILE_LOAD_PATH")
(files '("share/guile/site/2.0")))
@ -895,8 +899,10 @@
(lambda (k search-paths)
search-paths))))))
(and (null? (collect (package-derivation %store a)))
(equal? x (collect (package-derivation %store b)))
(equal? x (collect (package-derivation %store c)))))))
(parameterize ((t "guile-foo-0"))
(equal? x (collect (package-derivation %store b))))
(parameterize ((t "guile-bar-0"))
(equal? x (collect (package-derivation %store c))))))))
(test-assert "package-transitive-native-search-paths"
(let* ((sp (lambda (name)