3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
..
doc doc: document luksroot.nix changes in release notes 2018-08-08 02:47:50 +00:00
lib [bot] nixos/*: remove unused arguments in lambdas 2018-07-20 20:56:59 +00:00
maintainers create-amis.sh: Change directory for AMIs 2018-07-24 21:19:14 +02:00
modules Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
tests nixos/tests/luksroot: Fix OCR of passphrase prompt 2018-08-11 00:07:10 +02:00
COPYING
default.nix nixos: export packages of the current configuration (its pkgs argument) 2018-02-09 19:35:27 +00:00
README
release-combined.nix nixos/release-combined: remove keymap tests from tested job 2018-06-06 21:02:55 +02:00
release-small.nix Add the boot test to release-small.nix 2018-02-27 20:09:07 +01:00
release.nix Merge pull request #44556 from johanot/certmgr-module-init 2018-08-10 15:11:26 +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.