diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-07-29 18:29:58 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-07-29 18:29:58 -0400 |
| commit | 359aba76b655813895e7ed9290110e3750914d8b (patch) | |
| tree | a9f3493e76277cfc906e44c0fb1df07300f73260 /guix | |
| parent | 0bab3af0786ffd4caec05a29d7281ac5e5c18b6b (diff) | |
| parent | 9bdf56dc1349d1759fc670ff8715de25de0f0a9c (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/size.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index f28832ce90..ea259f3758 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -29,6 +29,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-37) #:use-module (ice-9 match) @@ -119,10 +120,12 @@ substitutes." information available in the local store or using information about substitutes." (lambda (store) - (guard (c ((nix-protocol-error? c) - (values (substitutable-requisites store items) - store))) - (values (requisites store items) store)))) + (let-values (((local missing) + (partition (cut valid-path? store <>) items))) + (values (delete-duplicates + (append (requisites store local) + (substitutable-requisites store missing))) + store)))) (define (store-profile items) "Return as a monadic value a list of <profile> objects representing the |