diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-07-22 18:58:48 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-22 18:58:48 +0200 |
commit | ccad0e4d6973da7af8badfb7125f35f7e51eb2d7 (patch) | |
tree | 15ff9da1c1c03b088d0ad9240f2c1878f5da5802 /guix/swh.scm | |
parent | d478cc043557ca3fcd5fced87d2e2c8e246eff03 (diff) | |
parent | 26986544469ef290885f5f8d71006751e9e8daf8 (diff) | |
download | guix-patches-ccad0e4d6973da7af8badfb7125f35f7e51eb2d7.tar guix-patches-ccad0e4d6973da7af8badfb7125f35f7e51eb2d7.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/swh.scm')
-rw-r--r-- | guix/swh.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/swh.scm b/guix/swh.scm index 89cddb2bdd..d692f81806 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,7 +31,9 @@ #:use-module (ice-9 regex) #:use-module (ice-9 popen) #:use-module ((ice-9 ftw) #:select (scandir)) - #:export (origin? + #:export (%swh-base-url + + origin? origin-id origin-type origin-url @@ -115,11 +117,11 @@ (define %swh-base-url ;; Presumably we won't need to change it. - "https://archive.softwareheritage.org") + (make-parameter "https://archive.softwareheritage.org")) (define (swh-url path . rest) (define url - (string-append %swh-base-url path + (string-append (%swh-base-url) path (string-join rest "/" 'prefix))) ;; Ensure there's a trailing slash or we get a redirect. |