3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Luca Bruno 83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
..
doc/manual apache-httpd: Make 2.4 the default 2014-11-06 14:55:44 +01:00
gui
lib Revert "nixos: iso-image: use syslinux bootloader for USB booting support" 2014-11-08 14:33:27 +01:00
maintainers
modules Merge branch 'master' into staging 2014-11-08 15:56:40 +01:00
tests Merge branch 'master' into staging 2014-11-08 15:56:40 +01:00
COPYING
default.nix
README
release-combined.nix
release-small.nix
release.nix

*** 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.