diff options
author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /guix/self.scm | |
parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'guix/self.scm')
-rw-r--r-- | guix/self.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/self.scm b/guix/self.scm index 666245321b..87d00ea64f 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -719,7 +719,9 @@ load path." ("share/guix/ci.guix.gnu.org.pub" ;alias ,(file-append* source "/etc/substitutes/berlin.guix.gnu.org.pub")) ("share/guix/ci.guix.info.pub" ;alias - ,(file-append* source "/etc/substitutes/berlin.guix.gnu.org.pub"))))) + ,(file-append* source "/etc/substitutes/berlin.guix.gnu.org.pub")) + ("share/guix/bordeaux.guix.gnu.org.pub" + ,(file-append* source "/etc/substitutes/bordeaux.guix.gnu.org.pub"))))) (define* (whole-package name modules dependencies #:key |