nixpkgs/pkgs/tools
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
..
admin treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
archivers cromfs: use default gcc 2016-08-24 22:41:41 +00:00
audio darkice: 1.2 -> 1.3 2016-08-23 18:50:47 +02:00
backup Revert "duply: add pythonPackages.cryptography" 2016-08-30 12:54:59 +02:00
bluetooth treewide: Fix output references to libpulseaudio 2016-08-23 04:53:16 +03:00
bootloaders/refind Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
cd-dvd Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
compression treewide: Shuffle outputs 2016-08-29 14:49:51 +03:00
filesystems Merge staging into master 2016-09-01 13:27:27 +03:00
graphics Merge staging into master 2016-09-01 13:27:27 +03:00
inputmethods ibus-engines.m17n: use autoreconfHook 2016-08-24 20:18:52 +00:00
misc Merge staging into master 2016-09-01 13:27:27 +03:00
networking Merge staging into master 2016-09-01 13:27:27 +03:00
package-management Merge staging into master 2016-09-01 13:27:27 +03:00
security Merge staging into master 2016-09-01 13:27:27 +03:00
system Merge staging into master 2016-09-01 13:27:27 +03:00
text treewide: Fix dev references to libxml2 2016-08-30 03:02:32 +03:00
typesetting Fix #4210: Remove builderDefs 2016-08-31 11:34:46 +02:00
video treewide: Make explicit that 'dev' output of SDL is used 2016-08-29 03:27:14 +03:00
virtualization treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
X11 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00