William A. Kennington III 5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream ...

This is a partial commit from staging in an attempt to make merges
smaller.

2015-09-23 14:35:36 -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

x11: replace its usage by xlibsWrapper directly

2015-09-15 12:08:24 +02:00

backup

bareos: 14.2.4 -> 15.2.1

2015-09-18 14:52:52 -07:00

bluetooth

Use libpulseaudio instead of pulseaudio

2015-05-29 14:32:56 -07:00

bootloaders/refind

refind: Fix build on i686

2015-04-27 15:24:24 +03:00

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

ceph-git: 2015-09-11 -> 2015-09-22

2015-09-23 12:30:00 -07: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

yubikey-personalization: 1.17.1 -> 1.17.2

2015-09-23 12:30:00 -07:00

networking

miniupnpc: further downgrade to 1.9.20150430

2015-09-23 12:06:46 +02:00

package-management

separateDebugInfo: Assert Linux

2015-09-22 20:21:10 +02:00

security

sshuttle: 0.61 -> 0.71

2015-09-23 12:19:24 +02:00

system

stress-ng: 0.04.19 -> 0.04.20

2015-09-21 02:51:54 +02:00

text

zimreader: init at 20150710.

2015-09-20 12:57:50 +08:00

typesetting

tetex: don't build on Hydra anymore

2015-09-23 21:19:14 +02:00

video

all-packages: Use callPackage where possible

2015-09-14 22:27:19 -06:00

virtualization

euca2ools: bump to 2.1.4, use python27

2015-03-07 14:06:08 -08:00

X11

Merge: xlibs and x11 attribute cleanup

2015-09-23 10:42:34 +02:00