nixpkgs/nixos
John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
..
doc/manual manual: update mailing list links 2017-07-18 07:54:36 -04:00
lib nixos tests: waitForWindow: output a list of windows we see prior to the final check 2017-06-20 21:16:35 -04:00
maintainers make-disk-image: change to be less VM-centric 2017-04-24 02:30:00 +00:00
modules Merge remote-tracking branch 'upstream/master' into staging-base 2017-07-26 13:46:04 -04:00
tests Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
COPYING
default.nix Remove nixFallback 2017-03-06 15:54:50 +01:00
README
release-combined.nix nixos release-combined: only build zfsroot tests on x86_64-linux 2017-06-30 15:21:30 -04:00
release-small.nix nixos/release-small.nix: cleanup to use default versions 2017-01-27 15:33:54 +01:00
release.nix snapper: add nixos module 2017-07-16 10:06:42 +01: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.