aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-07-09 15:52:46 +0200
committerLudovic Courtès <ludo@gnu.org>2020-07-10 00:11:00 +0200
commitd283bb960f927dd5f7bb8b96bc697221e4e8ad39 (patch)
tree5b316027926c66a674aea69dfc76f4410313f317
parent7828fe9d40696cb65102babc006024a509599f26 (diff)
downloadguix-d283bb960f927dd5f7bb8b96bc697221e4e8ad39.tar.gz
guix-d283bb960f927dd5f7bb8b96bc697221e4e8ad39.zip
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.
-rw-r--r--Makefile.am2
-rw-r--r--etc/substitutes/berlin.guix.gnu.org.pub (renamed from etc/substitutes/berlin.guixsd.org.pub)0
l---------etc/substitutes/ci.guix.gnu.org.pub2
l---------etc/substitutes/ci.guix.info.pub2
-rw-r--r--gnu/services/base.scm2
-rw-r--r--guix/build/download-nar.scm6
-rw-r--r--guix/self.scm8
7 files changed, 11 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 8988cdfa12..ee12725d5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -523,7 +523,7 @@ check-system: $(GOBJECTS)
# Public keys used to sign substitutes.
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.info.pub
diff --git a/etc/substitutes/berlin.guixsd.org.pub b/etc/substitutes/berlin.guix.gnu.org.pub
index f156a37b08..f156a37b08 100644
--- a/etc/substitutes/berlin.guixsd.org.pub
+++ b/etc/substitutes/berlin.guix.gnu.org.pub
diff --git a/etc/substitutes/ci.guix.gnu.org.pub b/etc/substitutes/ci.guix.gnu.org.pub
index b1d1e4d763..0574f6dfab 120000
--- a/etc/substitutes/ci.guix.gnu.org.pub
+++ b/etc/substitutes/ci.guix.gnu.org.pub
@@ -1 +1 @@
-berlin.guixsd.org.pub \ No newline at end of file
+berlin.guix.gnu.org.pub \ No newline at end of file
diff --git a/etc/substitutes/ci.guix.info.pub b/etc/substitutes/ci.guix.info.pub
index b1d1e4d763..0574f6dfab 120000
--- a/etc/substitutes/ci.guix.info.pub
+++ b/etc/substitutes/ci.guix.info.pub
@@ -1 +1 @@
-berlin.guixsd.org.pub \ No newline at end of file
+berlin.guix.gnu.org.pub \ No newline at end of file
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 6ea7ef8e7e..83dc406aac 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1481,7 +1481,7 @@ archive' public keys, with GUIX."
(define %default-authorized-guix-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>
guix-configuration make-guix-configuration
diff --git a/guix/build/download-nar.scm b/guix/build/download-nar.scm
index cb146038ad..f768a8c6dd 100644
--- a/guix/build/download-nar.scm
+++ b/guix/build/download-nar.scm
@@ -1,5 +1,5 @@
;;; 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.
;;;
@@ -42,10 +42,10 @@
"Return the fallback nar URL for ITEM--e.g.,
\"/gnu/store/cabbag3…-foo-1.2-checkout\"."
;; 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.
;; 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)))
(append (map (cut string-append <> "/nar/gzip/" item) bases)
(map (cut string-append <> "/nar/" item) bases))))
diff --git a/guix/self.scm b/guix/self.scm
index e1350a7403..f70b1ecdd8 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -647,13 +647,13 @@ load path."
,(file-append* source "/etc/completion/zsh/_guix"))
("share/fish/vendor_completions.d/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
- "/etc/substitutes/berlin.guixsd.org.pub"))
+ "/etc/substitutes/berlin.guix.gnu.org.pub"))
("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
- ,(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
#:key