summaryrefslogtreecommitdiff
path: root/hurd/running
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-20 00:19:17 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-20 00:19:17 +0100
commitaec2b7c45f2802ad095400a48aa3d6854ee694ed (patch)
treea5ca2b22ccfbfd3b08144c792d975e3efd7ae7d4 /hurd/running
parent40f08decf4943ab6848f1f9851da3c7634629e56 (diff)
parent9a1cf9275937cd7a368da02b5b58d92bc362d9de (diff)
Merge branch 'master' of flubber:~hurd-web/hurd-web
Diffstat (limited to 'hurd/running')
-rw-r--r--hurd/running/nixos.mdwn19
-rw-r--r--hurd/running/qemu.mdwn8
2 files changed, 22 insertions, 5 deletions
diff --git a/hurd/running/nixos.mdwn b/hurd/running/nixos.mdwn
new file mode 100644
index 00000000..2fa44ede
--- /dev/null
+++ b/hurd/running/nixos.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="NixOS"]]
+
+<http://www.nixos.org/>
+
+ * <http://hydra.nixos.org/jobset/gnu/hurd-master>
+
+ * <http://hydra.nixos.org/job/gnu/hurd-master/qemu_image/latest/download>
+
+ * <http://hydra.nixos.org/job/gnu/hurd-master/qemu_test>
diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index 0866d0ac..ee1574b7 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2005, 2006, 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
@@ -20,9 +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
-
-http://hydra.nixos.org/jobset/gnu/hurd-master
+## [[NixOS]]
## Unofficial Images