diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-09 00:18:32 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-09 00:18:32 +0100 |
| commit | fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442 (patch) | |
| tree | 5508f13c24ef19dd018cd91fe287e8fa50eda7e4 /etc | |
| parent | 16735b0b632b5f05fc914836b8f345e3a9e601dd (diff) | |
| parent | cec0c4e29c6efb337ae65d9c533cdbb2bf724430 (diff) | |
| download | gnu-guix-fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442.tar gnu-guix-fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/guix-install.sh | 4 | ||||
| l--------- | etc/substitutes/ci.guix.info.pub | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 6a01e59723..f0bfc932bd 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -361,8 +361,8 @@ sys_authorize_build_farms() case $yn in [Yy]*) guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/hydra.gnu.org.pub" && _msg "${PAS}Authorized public key for hydra.gnu.org"; - guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/berlin.guixsd.org.pub" && - _msg "${PAS}Authorized public key for berlin.guixsd.org"; + guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/ci.guix.info.pub" && + _msg "${PAS}Authorized public key for ci.guix.info"; break;; [Nn]*) _msg "${INF}Skipped authorizing build farm public keys" break;; diff --git a/etc/substitutes/ci.guix.info.pub b/etc/substitutes/ci.guix.info.pub new file mode 120000 index 0000000000..b1d1e4d763 --- /dev/null +++ b/etc/substitutes/ci.guix.info.pub @@ -0,0 +1 @@ +berlin.guixsd.org.pub
\ No newline at end of file |