From cb6ca5492c68fcdb3a5535272c43f1759736f1c3 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 21 Mar 2012 16:55:14 +0100 Subject: hurd/running/nixos -> hurd/running/nix. As per id:"87haxiaty9.fsf@gnu.org". --- contributing/web_pages/news/moth_next.mdwn | 6 +++--- hurd/running/distrib.mdwn | 1 + hurd/running/nix.mdwn | 19 +++++++++++++++++++ hurd/running/nixos.mdwn | 19 ------------------- hurd/running/qemu.mdwn | 2 +- hurd/status.mdwn | 6 +++--- open_issues/nightly_builds.mdwn | 2 +- 7 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 hurd/running/nix.mdwn delete mode 100644 hurd/running/nixos.mdwn diff --git a/contributing/web_pages/news/moth_next.mdwn b/contributing/web_pages/news/moth_next.mdwn index 7f3eeae0..e6f7147a 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 90211e34..befb015d 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/nix.mdwn b/hurd/running/nix.mdwn new file mode 100644 index 00000000..92e5459a --- /dev/null +++ b/hurd/running/nix.mdwn @@ -0,0 +1,19 @@ +[[!meta copyright="Copyright © 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 +document under the terms of the GNU Free Documentation License, Version 1.2 or +any later version published by the Free Software Foundation; with no Invariant +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="Nix-based GNU/Hurd System"]] + + + + * + + * + + * diff --git a/hurd/running/nixos.mdwn b/hurd/running/nixos.mdwn deleted file mode 100644 index 2fa44ede..00000000 --- a/hurd/running/nixos.mdwn +++ /dev/null @@ -1,19 +0,0 @@ -[[!meta copyright="Copyright © 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 -document under the terms of the GNU Free Documentation License, Version 1.2 or -any later version published by the Free Software Foundation; with no Invariant -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"]] - - - - * - - * - - * diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn index ee1574b7..fcf58d8a 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 87de1349..f8977343 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 b1097dc1..167e7375 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]] -- cgit v1.2.3