bug#48435: closed ([PATCH] Start enabling substitutes from bayfront.)

[GNU bug Tracking System]

Your message dated Fri, 18 Jun 2021 12:06:15 +0100
with message-id <87wnqr8mag.fsf@cbaines.net>
and subject line Re: [bug#48435] [PATCH v3] Start enabling substitutes from 
bordeaux.guix.gnu.org.
has caused the debbugs.gnu.org bug report #48435,
regarding [PATCH] Start enabling substitutes from bayfront.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
48435: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=48435
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] Start enabling substitutes from bayfront.
>
>
>
>
> Date: 
>
> Sat, 15 May 2021 11:08:22 +0100
>
>
>
>
> In addition to substitutes from ci.guix.gnu.org.  There are more changes that
> can be made in the future, but these changes seem like a good start.
>
> * etc/substitutes/bayfront.guix.gnu.org.pub: New file.
> * Makefile.am (dist_pkgdata_DATA): Add it.
> * config-daemon.ac (guix_substitute_urls): Add https://bayfront.guix.gnu.org.
> * guix/scripts/substitute.scm (%default-substitute-urls): Add
> http://bayfront.guix.gnu.org.
> * guix/store.scm (%default-substitute-urls): Add bayfront.guix.gnu.org.
> ---
>  Makefile.am                               | 3 ++-
>  config-daemon.ac                          | 2 +-
>  etc/substitutes/bayfront.guix.gnu.org.pub | 6 ++++++
>  guix/scripts/substitute.scm               | 3 ++-
>  guix/store.scm                            | 3 ++-
>  5 files changed, 13 insertions(+), 4 deletions(-)
>  create mode 100644 etc/substitutes/bayfront.guix.gnu.org.pub
>
> diff --git a/Makefile.am b/Makefile.am
> index 4cbef5a6e6..bad17e59fd 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -584,7 +584,8 @@ check-system: $(GOBJECTS)
>  dist_pkgdata_DATA =                            \
>    etc/substitutes/berlin.guix.gnu.org.pub      \
>    etc/substitutes/ci.guix.gnu.org.pub          \
> -  etc/substitutes/ci.guix.info.pub
> +  etc/substitutes/ci.guix.info.pub             \
> +  etc/substitutes/bayfront.guix.gnu.org.pub
>  
>  # Bash completion file.
>  dist_bashcompletion_DATA = etc/completion/bash/guix    \
> diff --git a/config-daemon.ac b/config-daemon.ac
> index 85caee269b..ee2ffbff42 100644
> --- a/config-daemon.ac
> +++ b/config-daemon.ac
> @@ -117,7 +117,7 @@ if test "x$guix_build_daemon" = "xyes"; then
>  
>    dnl Determine the appropriate default list of substitute URLs (GnuTLS
>    dnl is required so we can default to 'https'.)
> -  guix_substitute_urls="https://ci.guix.gnu.org";
> +  guix_substitute_urls="https://ci.guix.gnu.org https://bayfront.guix.gnu.org";
>  
>    AC_MSG_CHECKING([for default substitute URLs])
>    AC_MSG_RESULT([$guix_substitute_urls])
> diff --git a/etc/substitutes/bayfront.guix.gnu.org.pub 
> b/etc/substitutes/bayfront.guix.gnu.org.pub
> new file mode 100644
> index 0000000000..0092301e5a
> --- /dev/null
> +++ b/etc/substitutes/bayfront.guix.gnu.org.pub
> @@ -0,0 +1,6 @@
> +(public-key 
> + (ecc 
> +  (curve Ed25519)
> +  (q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)
> +  )
> + )
> diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
> index 8e4eae00b3..2fa2b1e219 100755
> --- a/guix/scripts/substitute.scm
> +++ b/guix/scripts/substitute.scm
> @@ -638,7 +638,8 @@ found."
>      (#f
>       ;; This can only happen when this script is not invoked by the
>       ;; daemon.
> -     '("http://ci.guix.gnu.org";))))
> +     '("http://ci.guix.gnu.org";
> +       "http://bayfront.guix.gnu.org";))))
>  
>  ;; In order to prevent using large number of discovered local substitute
>  ;; servers, limit the local substitute urls list size.
> diff --git a/guix/store.scm b/guix/store.scm
> index 9d706ae590..8fca37283f 100644
> --- a/guix/store.scm
> +++ b/guix/store.scm
> @@ -783,7 +783,8 @@ encoding conversion errors."
>    (map (if (false-if-exception (resolve-interface '(gnutls)))
>             (cut string-append "https://"; <>)
>             (cut string-append "http://"; <>))
> -       '("ci.guix.gnu.org")))
> +       '("ci.guix.gnu.org"
> +         "bayfront.guix.gnu.org")))
>  
>  (define (current-user-name)
>    "Return the name of the calling user."
> -- 
> 2.30.1
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#48435] [PATCH v3] Start enabling substitutes from bordeaux.guix.gnu.org. Date: Fri, 18 Jun 2021 12:06:15 +0100 User-agent: mu4e 1.4.15; emacs 27.2

Christopher Baines <mail@cbaines.net> writes:

> In addition to substitutes from ci.guix.gnu.org.  There are more changes that
> can be made in the future, but these changes seem like a good start.
>
> * config-daemon.ac (guix_substitute_urls): Add https://bordeaux.guix.gnu.org.
> * guix/scripts/substitute.scm (%default-substitute-urls): Add
> http://bordeaux.guix.gnu.org.
> * guix/store.scm (%default-substitute-urls): Add bordeaux.guix.gnu.org.
> * doc/guix.texi: Adjust accordingly.
> * doc/contributing.texi: Adjust accordingly.

Pushed as 4985a4272497bf9ba87a2190353d915da9b55906. I'll update the guix
package shortly.

signature.asc
Description: PGP signature

--- End Message ---