3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Vladimír Čunát 2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
..
doc/manual Uppercase GNOME version. 2017-08-28 19:50:59 +01:00
lib amazon-image: support VPC/VHD as an output format for the builder 2017-08-10 22:57:26 +00:00
maintainers amazon-image: fix typo in last commit 2017-08-11 02:12:39 +00:00
modules Merge branch 'master' into staging 2017-08-29 10:51:54 +02:00
tests nixos/tests/installer: Add stdenvNoCC to extraDependencies 2017-08-24 02:07:56 +03:00
COPYING
default.nix Remove nixFallback 2017-03-06 15:54:50 +01:00
README
release-combined.nix nixos/tests: Make the UEFI boot test release-critical 2017-08-19 08:46:48 +02:00
release-small.nix nixos/release-small.nix: cleanup to use default versions 2017-01-27 15:33:54 +01:00
release.nix elk: 5.4.2 -> 5.5.2 2017-08-23 01:58:12 +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.