William A. Kennington III e7bb9e1023 Merge branch 'master.upstream' into staging.upstream		2015-09-30 13:26:04 -07:00
..
admin	x11: replace its usage by xlibsWrapper directly	2015-09-15 12:08:24 +02:00
archivers	cpio: unbundle patch (fetch from my GitHub acct.)	2015-09-18 06:09:04 +02:00
audio	beets: fix tarball evaluation by asserting isLinux	2015-09-26 09:29:49 +02:00
backup	darwin purity: httrack	2015-09-30 00:36:35 -07:00
bluetooth	Use libpulseaudio instead of pulseaudio	2015-05-29 14:32:56 -07:00
bootloaders/refind
cd-dvd	unetbootin: 608 -> 613	2015-09-15 05:11:34 +08:00
compression	xdelta: tidy up	2015-08-03 01:41:55 +02:00
filesystems	bonnie++: init at 1.03e	2015-09-26 21:46:09 +02:00
graphics	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
inputmethods	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
misc	Merge branch 'master.upstream' into staging.upstream	2015-09-29 15:54:33 -07:00
networking	darwin purity: aria2	2015-09-30 00:36:35 -07:00
package-management	Remove nixops unstable expression, until we reintroduce it again. Currently it is not referenced, as nixopsUnstable = nixops.	2015-09-30 12:49:11 +00:00
security	add mpw	2015-09-30 00:35:09 -07:00
system	fio: Minor refactor	2015-09-25 22:16:43 +03:00
text	Merge pull request #10119 from k0ral/xurls	2015-09-28 23:04:14 +03:00
typesetting	texlive: Fix download file names to be current.	2015-09-30 09:21:09 +02:00
video	all-packages: Use callPackage where possible	2015-09-14 22:27:19 -06:00
virtualization	ec2-api-tools: Update to 1.7.5.1	2015-09-24 11:49:18 +02:00
X11	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00