Redirect /hydra to the GitHub project

This page didn't provide a lot of info and it was mostly outdated.
NixOS · Mar 13, 2020 · 2e496d3 · 2e496d3
1 parent 576a38d
commit 2e496d3
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 183 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,6 @@
 *.html
 *.xhtml
 
-/hydra/manual/
-/hydra/manual-raw
-
 /nixos/manual/
 /nixos/manual-raw
 /nixos/nix-pills/

diff --git a/Makefile b/Makefile
@@ -14,7 +14,6 @@ HTML = index.html news.html \
   nixos/community.html nixos/packages.html nixos/options.html \
   nixos/security.html nixos/foundation.html \
   nixos/wiki.html \
-  hydra/index.html \
   disnix/index.html disnix/download.html disnix/docs.html \
   disnix/extensions.html disnix/examples.html disnix/support.html \
   nixops/index.html
@@ -92,17 +91,6 @@ all: $(HTML) favicon.png $(subst .png,-small.png,$(filter-out %-small.png,$(wild
   nixos/options.json.gz
 
 
-### Prettify the Hydra manual.
-
-HYDRA_MANUAL_IN = /no-such-path
-HYDRA_MANUAL_OUT = hydra/manual
-
-all: $(HYDRA_MANUAL_OUT)
-
-$(HYDRA_MANUAL_OUT): $(HYDRA_MANUAL_IN) bootstrapify-docbook.sh bootstrapify-docbook.xsl layout.tt common.tt
-	bash ./bootstrapify-docbook.sh $(HYDRA_MANUAL_IN) $(HYDRA_MANUAL_OUT) 'Hydra manual' hydra https://github.com/NixOS/hydra/tree/master/doc/manual
-	ln -sfn manual.html $(HYDRA_MANUAL_OUT)/index.html
-
 favicon.png: logo/nixos-logo-only-hires.png
 	convert -resize 16x16 -background none -gravity center -extent 16x16 $< $@
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,7 +6,7 @@
   inputs.nixpkgsStable.url = "nixpkgs/release-19.09";
   inputs.nixpkgsUnstable.url = "nixpkgs/master";
 
-  outputs = { self, nixpkgsUnstable, nixpkgsStable, nix, hydra }:
+  outputs = { self, nixpkgsUnstable, nixpkgsStable, nix }:
     with import nixpkgsStable { system = "x86_64-linux"; };
     rec {
 
@@ -84,7 +84,6 @@
             "NIXOS_MANUAL_IN=${nixpkgsStable.htmlDocs.nixosManual}"
             "NIXPKGS_MANUAL_IN=${nixpkgsStable.htmlDocs.nixpkgsManual}"
             "NIXOPS_MANUAL_IN=${nixpkgsStable.legacyPackages.x86_64-linux.nixops}/share/doc/nixops"
-            "HYDRA_MANUAL_IN=${hydra.defaultPackage.x86_64-linux}/share/doc/hydra"
             "NIXPKGS_STABLE=${packages.x86_64-linux.stablePackagesList}"
             "NIXPKGS_UNSTABLE=${packages.x86_64-linux.unstablePackagesList}"
             "NIXOS_OPTIONS=${packages.x86_64-linux.nixosOptions}/share/doc/nixos/options.json"

diff --git a/hydra/index.tt b/hydra/index.tt
diff --git a/images/hydra.png b/images/hydra.png
diff --git a/layout.tt b/layout.tt
@@ -51,8 +51,6 @@
                 NixOps
               [% ELSIF menu == 'disnix' %]
                 Disnix
-              [% ELSIF menu == 'hydra' %]
-                Hydra
               [% ELSE %]
                 NixOS
               [% END %]
@@ -66,7 +64,6 @@
               <li><a href="[%root%]nixops">NixOps</a></li>
               <li><a href="[%root%]nixpkgs">Nixpkgs</a></li>
               <li class="divider"></li>
-              <li><a href="[%root%]hydra">Hydra</a></li>
               <li><a href="[%root%]disnix">Disnix</a></li>
             </ul>
           </li>
@@ -95,12 +92,6 @@
               </ul>
               <ul class="nav pull-right">
                 <li><a href="https://github.com/NixOS/nix"><i class="fa fa-github"></i></a></li>
-            [% ELSIF menu == 'hydra' %]
-              <ul class="nav pull-left">
-                <li><a href="[%root%]hydra/manual/">Manual</a></li>
-              </ul>
-              <ul class="nav pull-right">
-                <li><a href="https://github.com/NixOS/hydra"><i class="fa fa-github"></i></a></li>
             [% ELSIF menu == 'nixpkgs' %]
               <ul class="nav pull-left">
                 <li><a href="[%root%]nixpkgs/download.html">Download</a></li>

diff --git a/netlify.toml b/netlify.toml
@@ -27,3 +27,9 @@
   to = "https://channels.nixos.org/nix-latest/install"
   status = 301
   force = true
+
+[[redirects]]
+  from  = "/hydra"
+  to = "https://github.com/NixOS/hydra"
+  status = 301
+  force = true
diff --git a/news.xml b/news.xml
@@ -823,12 +823,8 @@ $ nix-store -qR /run/current-system | grep openssl
     <pubDate>Sat, 03 Dec 2011 00:00:00 GMT</pubDate>
     <title>Hydra talk at Inria</title>
     <description>
-      <a href="https://hydra.nixos.org/">
-      <img class="inline" src="images/hydra.png" alt="Hydra
-      logo"/></a>
-
       Ludovic Courtès gave a talk on <a
-      href="https://nixos.org/hydra">Hydra</a> at <a
+      href="https://github.com/NixOS/hydra">Hydra</a> at <a
       href="https://www.inria.fr/centre/bordeaux">Inria</a> (which has
       its own Hydra instance for building Inria software) entitled <a
       href="http://sed.bordeaux.inria.fr/seminars/hydra-ci_20111103.pdf">“Hydra:
@@ -1101,16 +1097,12 @@ $ nix-store -qR /run/current-system | grep openssl
       Hydra
     </title>
     <description>
-      <a href="https://hydra.nixos.org/">
-      <img class="inline" src="images/hydra.png" alt="Hydra
-      logo"/></a>
-
       <a
       href="https://hydra.nixos.org/releases/nix/unstable">Nix</a>
       and <a
       href="https://hydra.nixos.org/project/nixos/jobstatus">NixOS</a>
       releases are now built in <a
-      href="https://hydra.nixos.org/">Hydra</a>, the new Nix-based
+      href="https://github.com/NixOS/hydra">Hydra</a>, the new Nix-based
       continuous build system.  Hydra replaces our <a
       href="http://buildfarm.st.ewi.tudelft.nl/status">old Nix-based
       build farm</a>, which will be phased out soon.  There are

diff --git a/nix/about.tt b/nix/about.tt
@@ -204,7 +204,7 @@ the package:</p>
 
 <p>Since Nix packages are reproducible and have complete dependency
 specifications, Nix makes an excellent basis for <a
-href="[%root%]hydra">a continuous build system</a>.</p>
+href="https://github.com/NixOS/hydra">a continuous build system</a>.</p>
 
 
 <h3>Portability</h3>

diff --git a/nix/download.tt b/nix/download.tt
@@ -39,13 +39,6 @@ manual</a> for more information.</p>
 
   <li><a href="[%latestNixMirror%]/nix-[%latestNixVersion%].tar.xz">Source tarball</a>.</li>
 
-  <!--
-  <li><a
-  href="https://hydra.nixos.org/release/nix/nix-[%latestNixVersion%]">Binary
-  packages for several platforms</a>, including RPMs, Debs and binary
-  tarballs for Mac OS X.</li>
-  -->
-
   <li><a href="[%nixManual%]#ssec-relnotes-[%latestNixVersion%]">Release
   notes</a>.</li>
 
@@ -58,20 +51,6 @@ manual</a> for more information.</p>
 </section>
 
 
-<section><h2>Continuous builds</h2>
-
-<p>You can grab the latest bleeding-edge pre-release from our <a
-href="../hydra">continuous build system</a>:</p>
-
-<ul>
-  <li><a
-  href="https://hydra.nixos.org/job/nix/trunk/release#tabs-constituents">The
-  latest development release of Nix</a></li>
-</ul>
-
-</section>
-
-
 <section><h2>Old releases</h2>
 
 <p>Old releases are <a href="/releases/nix">also available</a>.</p>

diff --git a/nixos/community.tt b/nixos/community.tt
@@ -134,7 +134,7 @@ then make a pull request.</p>
 
 <h3>Continuous builds</h3>
 
-<p><a href="[%root%]hydra">Hydra</a> continuously builds NixOS:</p>
+<p><a href="https://github.com/NixOS/hydra">Hydra</a> continuously builds NixOS:</p>
 
 <ul>
   <li><a href="https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents">Status