Tuomas Tynkkynen 16b45ec3da Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/unix-tools.nix		2018-04-16 21:13:30 +03:00
..
altcoins	monero: fix darwin build	2018-04-04 21:33:45 +02:00
audio	asunder: 2.9.2 -> 2.9.3 (#38750)	2018-04-14 21:41:27 +02:00
backup	treewide: remove placeholder usage	2018-03-27 20:14:44 +02:00
display-managers	sddm: add missing include for gettimeofday, fix w/musl	2018-03-31 00:09:02 -05:00
editors	sublime3-dev: 3161 → 3162	2018-04-16 13:06:38 +02:00
gis	QGIS: Build with GRASS by default	2018-04-13 21:02:56 +01:00
graphics	k3d: clean up	2018-04-15 17:21:23 +02:00
inferno	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
kde	kalarm: init	2018-04-15 01:33:57 +02:00
misc	Merge pull request #38965 from thorstenweber83/slic3r-prusa3d-update-dependencies	2018-04-15 19:46:40 +01:00
networking	Merge pull request #38986 from scode/scode/signal-171-update	2018-04-16 20:12:43 +08:00
office	libreoffice: wrapper: apparently session bus for DBus is enough, and adding a local system bus when a session bus is present makes things worse	2018-04-15 08:33:42 +02:00
science	celestia: clean up	2018-04-15 17:21:23 +02:00
search	catfish: mark linux only	2018-04-05 20:05:18 +02:00
taxes	treewide: checkMeta fixes for x86_64-linux	2017-12-07 07:50:47 -05:00
version-management	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-16 21:13:30 +03:00
video	kazam: 1.4.3 → 1.4.5	2018-04-15 13:45:01 +02:00
virtualization	xen-4.8: fix qemu-xen build error in memfd.c	2018-04-13 22:06:52 +02:00
window-managers	sway: 0.15.1 -> 0.15.2	2018-04-13 22:56:57 +03:00