nixpkgs/nixos
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
..
doc/manual rl-1509.xml: Gnome -> GNOME 2015-10-01 12:53:27 +02:00
lib Fix Nix database in generated images 2015-09-28 14:47:48 +02:00
maintainers Hack to parallelize AMI copying 2015-09-29 14:54:12 +02:00
modules Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
tests Merge branch 'master.upstream' into staging.upstream 2015-09-30 13:26:04 -07:00
COPYING
default.nix
README
release-combined.nix Disable lightdm test 2015-08-17 10:48:04 +02:00
release-small.nix release-small.nix: Drop the grub1 test 2015-08-11 13:51:55 +02:00
release.nix Disable the ec2-config test 2015-09-28 13:47:14 +02: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.