diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-01 01:47:42 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-01 01:47:42 +0200 |
| commit | 9a25de2ecc790cd61e7426636de08e91d1fc79ad (patch) | |
| tree | 2ba85bfde67765c32cc8f4e9a6e99713f4c6b32b /hurd/running | |
| parent | d2e07b6ea330878b4c64e025ed6f7c966ef44701 (diff) | |
| parent | 1463fbc73ec78981596176b54da5cf7d5cc56f74 (diff) | |
Merge branch 'master' of flubber:~hurd-web/hurd-web
Diffstat (limited to 'hurd/running')
| -rw-r--r-- | hurd/running/distrib.mdwn | 1 | ||||
| -rw-r--r-- | hurd/running/nix.mdwn (renamed from hurd/running/nixos.mdwn) | 10 | ||||
| -rw-r--r-- | hurd/running/qemu.mdwn | 2 |
3 files changed, 11 insertions, 2 deletions
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/nixos.mdwn b/hurd/running/nix.mdwn index 2fa44ede..663589f6 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/> @@ -17,3 +17,11 @@ License|/fdl]]."]]"""]] * <http://hydra.nixos.org/job/gnu/hurd-master/qemu_image/latest/download> * <http://hydra.nixos.org/job/gnu/hurd-master/qemu_test> + +--- + +This QEMU image is not (yet) comparable to NixOS, because the latter provides +extra features, such as whole-system configuration (including services, etc.), +and whole-system transactional update and rollback. It is is cross-built using +Nix, and because of that, it uses per-package installation directories under +`/nix/store`. 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 |