nixpkgs/nixos
aszlig 8754986076
nixos: Fix build of manual
XML error introduced with merge commit 4e0fea3fe294d112ac6eef5adbed2357.

This was probably because of wrong conflict resolution, because the
actual change (d8e697b4fcfd929d05221ac3e67b9c04ac69df86) had the close
tag of the <para/> element, but the merge commit didn't.

Signed-off-by: aszlig <aszlig@nix.build>
2020-02-10 13:33:52 +01:00
..
doc nixos: Fix build of manual 2020-02-10 13:33:52 +01:00
lib Merge pull request #79335 from flokli/deprecate-perl-vm-tests 2020-02-09 21:08:11 -05:00
maintainers maintainers/create-azure.sh: run from anywhere 2020-01-09 20:54:28 +00:00
modules Merge pull request #77578 from m1cr0man/master 2020-02-10 11:47:30 +01:00
tests Merge pull request #77578 from m1cr0man/master 2020-02-10 11:47:30 +01:00
COPYING
default.nix
README
release-combined.nix release-combined: readd keymap tests 2020-02-09 16:03:00 -05:00
release-small.nix nixos/containers-ip: Test both ipv4 and ipv6 in the same script 2019-11-27 09:13:02 +01:00
release.nix nixos/release: rename iso_graphical to iso_plasma5 2020-01-27 16:34:37 -05:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.