nixpkgs/nixos
Tuomas Tynkkynen 1a06373c0a Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
2018-02-13 16:42:55 +02:00
..
doc/manual Merge remote-tracking branch 'upstream/master' into staging 2018-02-13 16:42:55 +02:00
lib nixos/testing: use the same qemu in the test driver 2018-02-11 23:40:54 +01:00
maintainers nixos/make-disk-image.nix: Support EFI images 2018-01-22 11:18:23 +02:00
modules Merge remote-tracking branch 'upstream/master' into staging 2018-02-13 16:42:55 +02:00
tests nixos/rdma-core: add module for soft RoCE and test (#34607) 2018-02-10 07:52:03 +00:00
COPYING Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
default.nix nixos: export packages of the current configuration (its pkgs argument) 2018-02-09 19:35:27 +00: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/release*.nix: Clean nixpkgs sources by default 2018-02-09 18:32:26 +00:00
release-small.nix nixos/tests: add predictable-interface-names.nix (#34305) 2018-02-09 18:40:39 +00:00
release.nix nixos/rdma-core: add module for soft RoCE and test (#34607) 2018-02-10 07:52:03 +00: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.