diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/guix-daemon.service.in | 2 | ||||
| -rwxr-xr-x | etc/guix-install.sh | 6 | ||||
| -rw-r--r-- | etc/guix-publish.service.in | 2 | ||||
| -rw-r--r-- | etc/snippets/scheme-mode/guix-bzr-reference | 7 | ||||
| -rw-r--r-- | etc/snippets/scheme-mode/guix-origin | 6 | ||||
| l--------- | etc/substitutes/ci.guix.gnu.org.pub | 1 |
6 files changed, 17 insertions, 7 deletions
diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in index 99ec7c48f8..7b20a91931 100644 --- a/etc/guix-daemon.service.in +++ b/etc/guix-daemon.service.in @@ -7,7 +7,7 @@ Description=Build daemon for GNU Guix [Service] ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild -Environment=GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale +Environment=GUIX_LOCPATH='@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 RemainAfterExit=yes StandardOutput=syslog StandardError=syslog diff --git a/etc/guix-install.sh b/etc/guix-install.sh index dc8de2fe92..a0777c8bfe 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -54,7 +54,7 @@ ERR=$'[ \033[31;1mFAIL\033[0m ] ' INF="[ INFO ] " DEBUG=0 -GNU_URL="https://alpha.gnu.org/gnu/guix/" +GNU_URL="https://ftp.gnu.org/gnu/guix/" OPENPGP_SIGNING_KEY_ID="3CE464558A84FDC69DB40CFB090B11993D9AEBB5" # This script needs to know where root's home directory is. However, we @@ -368,8 +368,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/ci.guix.info.pub" && - _msg "${PAS}Authorized public key for ci.guix.info"; + guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/ci.guix.gnu.org.pub" && + _msg "${PAS}Authorized public key for ci.guix.gnu.org"; break;; [Nn]*) _msg "${INF}Skipped authorizing build farm public keys" break;; diff --git a/etc/guix-publish.service.in b/etc/guix-publish.service.in index 0526f97994..e61a0314ce 100644 --- a/etc/guix-publish.service.in +++ b/etc/guix-publish.service.in @@ -7,7 +7,7 @@ Description=Publish the GNU Guix store [Service] ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181 -Environment=GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale +Environment=GUIX_LOCPATH='@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 RemainAfterExit=yes StandardOutput=syslog StandardError=syslog diff --git a/etc/snippets/scheme-mode/guix-bzr-reference b/etc/snippets/scheme-mode/guix-bzr-reference new file mode 100644 index 0000000000..a801cc36f2 --- /dev/null +++ b/etc/snippets/scheme-mode/guix-bzr-reference @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: guix-bzr-reference +# key: bzr-reference... +# -- +(bzr-reference + (url "$1") + (revision ${2:ref})) \ No newline at end of file diff --git a/etc/snippets/scheme-mode/guix-origin b/etc/snippets/scheme-mode/guix-origin index 1a068f8859..2820a369f3 100644 --- a/etc/snippets/scheme-mode/guix-origin +++ b/etc/snippets/scheme-mode/guix-origin @@ -9,15 +9,17 @@ "cvs-fetch" "git-fetch" "hg-fetch" - "svn-fetch")}) + "svn-fetch" + "bzr-fetch")}) (uri ${1:$(cond ((equal yas-text "git-fetch") "git-reference...") ((equal yas-text "svn-fetch") "svn-reference...") ((equal yas-text "hg-fetch") "hg-reference...") ((equal yas-text "cvs-fetch") "cvs-reference...") + ((equal yas-text "bzr-fetch") "bzr-reference...") (t "(string-append \\"https://\\" version \\".tar.gz\\")"))}$0) ${1:$(cond ((equal yas-text "git-fetch") "(file-name (git-file-name name version))") - ((member yas-text '("svn-fetch" "hg-fetch" "cvs-fetch")) + ((member yas-text '("svn-fetch" "hg-fetch" "cvs-fetch" "bzr-fetch")) "(file-name (string-append name \\"-\\" version \\"-checkout\\"))") (t ""))} (sha256 diff --git a/etc/substitutes/ci.guix.gnu.org.pub b/etc/substitutes/ci.guix.gnu.org.pub new file mode 120000 index 0000000000..b1d1e4d763 --- /dev/null +++ b/etc/substitutes/ci.guix.gnu.org.pub @@ -0,0 +1 @@ +berlin.guixsd.org.pub \ No newline at end of file |