me
/
guix
Archived
1
0
Fork 0
Code

maint: Remove traces of "berlin.guixsd.org". 

The guixsd.org domain is no longer advertised since before in 1.0.0
release in May 2019.

* etc/substitutes/berlin.guixsd.org.pub: Rename to...
* etc/substitutes/berlin.guix.gnu.org.pub: ... this.
* etc/substitutes/ci.guix.gnu.org.pub,
etc/substitutes/ci.guix.info.pub: Adjust accordingly.
* gnu/services/base.scm (%default-authorized-guix-keys): Likewise.
* guix/build/download-nar.scm (urls-for-item): Likewise.
* guix/self.scm (miscellaneous-files): Likewise.
* Makefile.am (dist_pkgdata_DATA): Likewise.
master
Ludovic Courtès 2020-07-09 15:52:46 +02:00
parent 7828fe9d40
commit d283bb960f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -523,7 +523,7 @@ check-system: $(GOBJECTS)
# Public keys used to sign substitutes. # Public keys used to sign substitutes.
dist_pkgdata_DATA = \ dist_pkgdata_DATA = \
etc/substitutes/berlin.guixsd.org.pub \ etc/substitutes/berlin.guix.gnu.org.pub \
etc/substitutes/ci.guix.gnu.org.pub \ etc/substitutes/ci.guix.gnu.org.pub \
etc/substitutes/ci.guix.info.pub etc/substitutes/ci.guix.info.pub

0
etc/substitutes/berlin.guixsd.org.pub → etc/substitutes/berlin.guix.gnu.org.pub
View File

2
etc/substitutes/ci.guix.gnu.org.pub
View File

@ -1 +1 @@
berlin.guixsd.org.pub berlin.guix.gnu.org.pub

2
etc/substitutes/ci.guix.info.pub
View File

@ -1 +1 @@
berlin.guixsd.org.pub berlin.guix.gnu.org.pub

2
gnu/services/base.scm
View File

@ -1481,7 +1481,7 @@ archive' public keys, with GUIX."
(define %default-authorized-guix-keys (define %default-authorized-guix-keys
;; List of authorized substitute keys. ;; List of authorized substitute keys.
(list (file-append guix "/share/guix/berlin.guixsd.org.pub"))) (list (file-append guix "/share/guix/berlin.guix.gnu.org.pub")))
(define-record-type* <guix-configuration> (define-record-type* <guix-configuration>
guix-configuration make-guix-configuration guix-configuration make-guix-configuration

6
guix/build/download-nar.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -42,10 +42,10 @@
"Return the fallback nar URL for ITEM--e.g., "Return the fallback nar URL for ITEM--e.g.,
\"/gnu/store/cabbag3…-foo-1.2-checkout\"." \"/gnu/store/cabbag3…-foo-1.2-checkout\"."
;; Here we hard-code nar URLs without checking narinfos. That's probably OK ;; Here we hard-code nar URLs without checking narinfos. That's probably OK
;; though. Use berlin.guixsd.org instead of its ci.guix.gnu.org front end to ;; though. Use berlin.guix.gnu.org instead of its ci.guix.gnu.org front end to
;; avoid sending these requests to CDN providers without user consent. ;; avoid sending these requests to CDN providers without user consent.
;; TODO: Use HTTPS? The downside is the extra dependency. ;; TODO: Use HTTPS? The downside is the extra dependency.
(let ((bases '("http://berlin.guixsd.org")) (let ((bases '("http://berlin.guix.gnu.org"))
(item (basename item))) (item (basename item)))
(append (map (cut string-append <> "/nar/gzip/" item) bases) (append (map (cut string-append <> "/nar/gzip/" item) bases)
(map (cut string-append <> "/nar/" item) bases)))) (map (cut string-append <> "/nar/" item) bases))))

8
guix/self.scm
View File

@ -647,13 +647,13 @@ load path."
,(file-append* source "/etc/completion/zsh/_guix")) ,(file-append* source "/etc/completion/zsh/_guix"))
("share/fish/vendor_completions.d/guix.fish" ("share/fish/vendor_completions.d/guix.fish"
,(file-append* source "/etc/completion/fish/guix.fish")) ,(file-append* source "/etc/completion/fish/guix.fish"))
("share/guix/berlin.guixsd.org.pub" ("share/guix/berlin.guix.gnu.org.pub"
,(file-append* source ,(file-append* source
"/etc/substitutes/berlin.guixsd.org.pub")) "/etc/substitutes/berlin.guix.gnu.org.pub"))
("share/guix/ci.guix.gnu.org.pub" ;alias ("share/guix/ci.guix.gnu.org.pub" ;alias
,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub")) ,(file-append* source "/etc/substitutes/berlin.guix.gnu.org.pub"))
("share/guix/ci.guix.info.pub" ;alias ("share/guix/ci.guix.info.pub" ;alias
,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub"))))) ,(file-append* source "/etc/substitutes/berlin.guix.gnu.org.pub")))))
(define* (whole-package name modules dependencies (define* (whole-package name modules dependencies
#:key #:key