3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
..
doc/manual nixos/manual: Re-add development section. 2015-01-25 20:12:06 +01:00
gui Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
lib nixos: allow adding extra modules through environment 2014-12-16 19:13:15 +01:00
maintainers Minor fixes to EC2 image generation script. Set autoresponder, so no interaction is necessary. Write output in a format that can be easily included in ec2-amis.nix of nixops. 2015-01-05 09:35:48 +01:00
modules Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 2015-02-02 21:14:28 -05:00
tests nixos/tests/chromium: Increase VM memory size. 2015-01-26 09:31:03 +01:00
COPYING Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
default.nix Fix nixos-option 2013-10-28 22:45:58 +01:00
README Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
release-combined.nix add chromium test to the tested job 2014-12-14 13:47:19 +01:00
release-small.nix java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
release.nix nixos: disable gitlab test for now 2015-01-25 16:29: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.