diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-03-27 14:42:07 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-03-27 14:59:41 +0100 |
| commit | 1ee3d2dcb8892b2ed1a0212fdd6ac2c47f2c8da2 (patch) | |
| tree | 09b0cc5397ffb9f74bc85965e461eafc1413cf1b | |
| parent | 18c51cf3d3dff9d6657049356c96e56eacdc8275 (diff) | |
| download | patches-1ee3d2dcb8892b2ed1a0212fdd6ac2c47f2c8da2.tar patches-1ee3d2dcb8892b2ed1a0212fdd6ac2c47f2c8da2.tar.gz | |
upstream: 'package-update' returns the <upstream-source> object.
Fixes a regression introduced in
abd4d6b33dba4de228e90ad15a8efb456fcf7b6e, where CHANGES would no longer
be a thunk.
Reported by Ricardo Wurmus.
* guix/upstream.scm (package-update/url-fetch): Return SOURCE as the
third value instead of CHANGES.
* guix/scripts/refresh.scm (update-package): Adjust accordingly.
| -rw-r--r-- | guix/scripts/refresh.scm | 4 | ||||
| -rw-r--r-- | guix/upstream.scm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index 5b0f345cde..6d77e2642b 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -297,7 +297,7 @@ KEY-DOWNLOAD specifies a download policy for missing OpenPGP keys; allowed values: 'interactive' (default), 'always', and 'never'. When WARN? is true, warn about packages that have no matching updater." (if (lookup-updater package updaters) - (let-values (((version tarball changes) + (let-values (((version tarball source) (package-update store package updaters #:key-download key-download)) ((loc) @@ -330,7 +330,7 @@ warn about packages that have no matching updater." (G_ "~a: consider removing this propagated input: ~a~%"))) (package-name package) (upstream-input-change-name change))) - (changes)) + (upstream-source-input-changes source)) (let ((hash (call-with-input-file tarball port-sha256))) (update-package-source package version hash))) diff --git a/guix/upstream.scm b/guix/upstream.scm index 55683dd9b7..2c70b3422d 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -344,10 +344,10 @@ values: the item from LST1 and the item from LST2 that match PRED." (define* (package-update/url-fetch store package source #:key key-download) - "Return the version, tarball, and input changes needed to update PACKAGE to + "Return the version, tarball, and SOURCE, to update PACKAGE to SOURCE, an <upstream-source>." (match source - (($ <upstream-source> _ version urls signature-urls changes) + (($ <upstream-source> _ version urls signature-urls) (let*-values (((archive-type) (match (and=> (package-source package) origin-uri) ((? string? uri) @@ -371,7 +371,7 @@ SOURCE, an <upstream-source>." (or signature-urls (circular-list #f))))) (let ((tarball (download-tarball store url signature-url #:key-download key-download))) - (values version tarball changes)))))) + (values version tarball source)))))) (define %method-updates ;; Mapping of origin methods to source update procedures. |