nixpkgs/pkgs/tools
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
..
admin treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
archivers zpaq: only set -mtune on i686,x86_64 (#18214) 2016-09-02 13:34:11 +02: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 refind: refactorings 2016-09-01 14:51:32 +02: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 pull request #18227 from rushmorem/lizardfs-manpages 2016-09-02 21:20:19 +02: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 graylog: 2.0.3 -> 2.1.0 (#18200) 2016-09-02 13:53:17 +02:00
networking Merge commit 'adaee73' from staging into master 2016-09-03 01:02:51 +03:00
package-management nixui: migrate to node2nix 2016-09-01 12:14:20 +00:00
security Disable bunch of non-compiling packages on Darwin 2016-09-01 20:39:33 +03:00
system vboot_reference: fix build (#18211) 2016-09-02 12:13:00 +02:00
text wring: use node2nix generated package 2016-09-01 20:50:08 +00: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 azure-cli: remove, because it has been supersed by a version generated by node2nix 2016-09-01 19:07:13 +00:00
X11 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00