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

gnu-maintenance: Honor 'upstream-name' property in GNU updater. 

* guix/gnu-maintenance.scm (gnu-package?): Honor the 'usptream-name'
property of PACKAGE.
(ftp-server/directory): Likewise.
This commit is contained in:
Ludovic Courtès 2017-01-27 23:20:59 +01:00
parent d61b2482df
commit b03218d532
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
guix/gnu-maintenance.scm
View File

@ -195,7 +195,9 @@ network to check in GNU's database."
(or (gnu-home-page? package) (or (gnu-home-page? package)
(let ((url (and=> (package-source package) origin-uri)) (let ((url (and=> (package-source package) origin-uri))
(name (package-name package))) (name (or (assq-ref (package-properties package)
'upstream-name)
(package-name package))))
(case (and (string? url) (mirror-type url)) (case (and (string? url) (mirror-type url))
((gnu) #t) ((gnu) #t)
((non-gnu) #f) ((non-gnu) #f)
@ -210,10 +212,12 @@ network to check in GNU's database."
(define (ftp-server/directory package) (define (ftp-server/directory package)
"Return the FTP server and directory where PACKAGE's tarball are stored." "Return the FTP server and directory where PACKAGE's tarball are stored."
(values (or (assoc-ref (package-properties package) 'ftp-server) (let ((name (or (assq-ref (package-properties package) 'upstream-name)
"ftp.gnu.org") (package-name package))))
(or (assoc-ref (package-properties package) 'ftp-directory) (values (or (assoc-ref (package-properties package) 'ftp-server)
(string-append "/gnu/" (package-name package))))) "ftp.gnu.org")
(or (assoc-ref (package-properties package) 'ftp-directory)
(string-append "/gnu/" name)))))
(define (sans-extension tarball) (define (sans-extension tarball)
"Return TARBALL without its .tar.* or .zip extension." "Return TARBALL without its .tar.* or .zip extension."