summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2012-03-21 16:55:14 +0100
committerThomas Schwinge <thomas@schwinge.name>2012-03-21 16:55:14 +0100
commitcb6ca5492c68fcdb3a5535272c43f1759736f1c3 (patch)
treed1680e439cb6e7a58b60699aaba285c63dca7ee2
parent0a7036f52aa048fdf812d8c4374e77f6813b66e1 (diff)
hurd/running/nixos -> hurd/running/nix.
As per id:"87haxiaty9.fsf@gnu.org".
-rw-r--r--contributing/web_pages/news/moth_next.mdwn6
-rw-r--r--hurd/running/distrib.mdwn1
-rw-r--r--hurd/running/nix.mdwn (renamed from hurd/running/nixos.mdwn)2
-rw-r--r--hurd/running/qemu.mdwn2
-rw-r--r--hurd/status.mdwn6
-rw-r--r--open_issues/nightly_builds.mdwn2
6 files changed, 10 insertions, 9 deletions
diff --git a/contributing/web_pages/news/moth_next.mdwn b/contributing/web_pages/news/moth_next.mdwn
index 7f3eeae..e6f7147 100644
--- a/contributing/web_pages/news/moth_next.mdwn
+++ b/contributing/web_pages/news/moth_next.mdwn
@@ -25,9 +25,9 @@ This quarter, Ludovic Courtès contributed a [continuously-built Nix-based QEMU
image](http://lists.gnu.org/archive/html/bug-hurd/2011-11/msg00042.html),
raising the count of GNU/Hurd distributions to three: [[Debian
GNU/Hurd|hurd/running/debian]], [[hurd/running/Arch_Hurd]], and now
-[[hurd/running/NixOS]]. His build is still pretty basic, but a step into the
-right direction: [[!wikipedia "continuous integration"]] is a great feature for
-automated testing.
+[[hurd/running/Nix]]. His build is still pretty basic, but a step into the
+right direction: [[!wikipedia "continuous integration"]] is a great facility
+for automated testing.
Samuel Thibault followed suit with a [new Debian GNU/Hurd disk
set](http://lists.debian.org/debian-hurd/2011/12/msg00095.html) as a christmas
diff --git a/hurd/running/distrib.mdwn b/hurd/running/distrib.mdwn
index 90211e3..befb015 100644
--- a/hurd/running/distrib.mdwn
+++ b/hurd/running/distrib.mdwn
@@ -5,6 +5,7 @@ Working distributions of GNU/Hurd:
GNU/Hurd distributions in early stages of development:
* [[Arch|arch_hurd]] (features a LiveCD)
+* [[Nix]]
* [[Gentoo]]
* [[GNU]]
diff --git a/hurd/running/nixos.mdwn b/hurd/running/nix.mdwn
index 2fa44ed..92e5459 100644
--- a/hurd/running/nixos.mdwn
+++ b/hurd/running/nix.mdwn
@@ -8,7 +8,7 @@ Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license
is included in the section entitled [[GNU Free Documentation
License|/fdl]]."]]"""]]
-[[!meta title="NixOS"]]
+[[!meta title="Nix-based GNU/Hurd System"]]
<http://www.nixos.org/>
diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index ee1574b..fcf58d8 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -20,7 +20,7 @@ You can use the following images to give the GNU/Hurd a try.
[[!inline pages=hurd/running/debian/qemu_image raw=yes feeds=no]]
-## [[NixOS]]
+## [[Nix]]
## Unofficial Images
diff --git a/hurd/status.mdwn b/hurd/status.mdwn
index 87de134..f897734 100644
--- a/hurd/status.mdwn
+++ b/hurd/status.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2001, 2002, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2001, 2002, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -65,7 +65,7 @@ was published on 2012 February 21st.
[[Arch_Hurd|hurd/running/arch_hurd]] offers *LiveCDs* for testing and
install.
-[[Nix|hurd/running/qemu]] provides qemu images.
+[[hurd/running/Nix]] provides QEMU images.
That said, the last official release of the Hurd
without the Debian parts was 0.2 done in 1997.
diff --git a/open_issues/nightly_builds.mdwn b/open_issues/nightly_builds.mdwn
index b1097dc..167e737 100644
--- a/open_issues/nightly_builds.mdwn
+++ b/open_issues/nightly_builds.mdwn
@@ -14,7 +14,7 @@ automatic [[unit_testing]] on them.
Resources:
- * [[hurd/running/NixOS]]
+ * [[hurd/running/Nix]]
* [[toolchain/cross-gnu]]