nixpkgs

History

Tuomas Tynkkynen 8c4aeb1780 Merge staging into master

Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix

2016-09-01 13:27:27 +03:00

doc/manual

Merge staging into master

2016-09-01 13:27:27 +03:00

lib

nixos: generalize copy-paste from stage-1 and zfs to utils

2016-08-23 18:14:06 +00:00

maintainers

Add AMIs in ap-northeast-2 and ap-south-1

2016-07-12 17:26:25 +02:00

modules

Merge staging into master

2016-09-01 13:27:27 +03:00

tests

Merge remote-tracking branch 'origin/master' into hardened-stdenv

2016-08-24 11:01:53 +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

Revert "Temporarily disable chromium test"

2016-08-23 14:16:58 +01:00

release-small.nix

release-small: drop mysql51, removed in 975d33e6

2016-08-13 09:46:42 +02:00

release.nix

Revert "Temporarily disable chromium test"

2016-08-23 14:16:58 +01:00

README

*** 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.