summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2019-06-28 16:19:15 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2019-06-29 06:28:50 +0200
commit44b5f28a77d94609cc43d713c46f6c1bdc4e380b (patch)
tree73aaaca5fba0acc34952c064eb1efa147bfd3127
parent414c4de15de50c9bbc1d7159418f52fdcc6dab13 (diff)
doc: Remove references to hydra.gnu.org.
* doc/contributing.texi (Packaging Guidelines, Submitting Patches): Replace hydra URL with @value{SUBSTITUTE-SERVER}. * doc/guix.texi (Official Substitute Server): Remove ‘hydra’ @cindex. (Substitute Server Authorization): Remove note about hydra.gnu.org.pub.
-rw-r--r--doc/contributing.texi5
-rw-r--r--doc/guix.texi7
2 files changed, 2 insertions, 10 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi
index 6770fae222..e00634eed4 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -281,8 +281,7 @@ Once your package builds correctly, please send us a patch
(@pxref{Submitting Patches}). Well, if you need help, we will be happy to
help you too. Once the patch is committed in the Guix repository, the
new package automatically gets built on the supported platforms by
-@url{http://hydra.gnu.org/jobset/gnu/master, our continuous integration
-system}.
+@url{@value{SUBSTITUTE-SERVER}, our continuous integration system}.
@cindex substituter
Users can obtain the new package definition simply by running
@@ -893,7 +892,7 @@ changes). This branch is intended to be merged in @code{master} every
2.5 months or so.
@end table
-All these branches are @uref{https://hydra.gnu.org/project/gnu,
+All these branches are @uref{@value{SUBSTITUTE-SERVER},
tracked by our build farm} and merged into @code{master} once
everything has been successfully built. This allows us to fix issues
before they hit users, and to reduce the window during which pre-built
diff --git a/doc/guix.texi b/doc/guix.texi
index f0d148ace0..f6be4c6117 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3134,7 +3134,6 @@ also result from derivation builds, can be available as substitutes.
@node Official Substitute Server
@subsection Official Substitute Server
-@cindex hydra
@cindex build farm
The @code{@value{SUBSTITUTE-SERVER}} server is a front-end to an official build farm
that builds packages from Guix continuously for some
@@ -3186,12 +3185,6 @@ Then, you can run something like this:
# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub
@end example
-@quotation Note
-Similarly, the @file{hydra.gnu.org.pub} file contains the public key
-of an independent build farm also run by the project, reachable at
-@indicateurl{https://mirror.hydra.gnu.org}.
-@end quotation
-
Once this is in place, the output of a command like @code{guix build}
should change from something like: