nixpkgs

History

Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master

This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.

Conflicts:
	pkgs/data/documentation/man-pages/default.nix

2016-09-03 01:02:51 +03:00

doc/manual

unstable is now 17.03

2016-09-02 08:47:21 +02: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 commit 'adaee73' from staging into master

2016-09-03 01:02:51 +03:00

tests

Merge #17838 : postgresql: Fix use with extensions

2016-09-02 20:09:40 +02:00

COPYING

…

default.nix

nix: Add a "dev" output

2016-04-18 21:13:18 +02:00

README

…

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.