diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-23 10:11:29 +0200 |
commit | 4c204d01d57ac7da11a5772d5d4e3254d1c2408f (patch) | |
tree | c7e5cb013abc742734acd9613674df4ebddfdeef /guix/scripts/refresh.scm | |
parent | 82bdb77082fa4e100761f70086b745dfb280c3ac (diff) | |
parent | 445a0359083388b5ee686e6e855f94a3aac5f79c (diff) | |
download | guix-gnome-team.tar.gz |
Merge branch 'master' into gnome-team gnome-team
Diffstat (limited to 'guix/scripts/refresh.scm')
-rw-r--r-- | guix/scripts/refresh.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index f5cb18af22..a9241aa20d 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -228,7 +228,8 @@ options like '--recursive'." (let* ((input->package (match-lambda ((name (? package? package) _ ...) package) (_ #f))) - (final-inputs (map input->package %final-inputs)) + (final-inputs (map input->package + (%final-inputs (%current-system)))) (core (append final-inputs (append-map (compose (cut filter-map input->package <>) package-transitive-inputs) @@ -590,7 +591,8 @@ all are dependent packages: ~{~a~^ ~}~%") (string-append (config-directory) "/upstream/trustedkeys.kbx")))) (let* ((spec-line - (compose location->string + (compose (cut string-trim-right <> char-set:digit) + location->string package-location update-spec-package)) ;; Sort the specs so that we update packages from the |