nixpkgs/nixos
Tuomas Tynkkynen 0dbfb0fc48 Merge commit 'bd6e40c' from staging into master
Major changes being pulled in:

- mesa: maintenance 12.0.1 -> 12.0.2
- texlive: 2015 -> 2016
2016-09-10 23:23:44 +03:00
..
doc/manual Merge commit 'bd6e40c' from staging into master 2016-09-10 23:23:44 +03:00
lib runInMachine: Unset another variable 2016-09-09 20:02:56 +02:00
maintainers Add AMIs in ap-northeast-2 and ap-south-1 2016-07-12 17:26:25 +02:00
modules mpd service: replace script with serviceConfig.ExecStart 2016-09-10 18:30:14 +02:00
tests Remove docker-registry as it's deprecated #18209 2016-09-09 18:50:42 +02:00
COPYING Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
default.nix nix: Add a "dev" output 2016-04-18 21:13:18 +02: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 nixos/tests/kde5: rename from sddm-kde5 and run by default 2016-09-09 10:12:38 -05:00
release-small.nix release-small: drop mysql51, removed in 975d33e6 2016-08-13 09:46:42 +02:00
release.nix Remove test leftover from docker-registry 2016-09-10 10:49:55 +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.