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

..

applications

Merge staging into master

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

build-support

Merge staging into master

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

data

Merge staging into master

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

desktops

gnome3: Use dev output of nss

2016-08-30 02:41:13 +03:00

development

Merge staging into master

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

games

fsg: disable format hardening

2016-08-29 17:01:03 +00:00

misc

Merge staging into master

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

os-specific

Merge staging into master

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

servers

Merge staging into master

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

shells

Merge branch 'master' into staging

2016-08-27 23:54:54 +01:00

stdenv

Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging

2016-08-30 12:43:37 +03:00

test

…

tools

Merge staging into master

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

top-level

Merge staging into master

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