Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/stdenv/generic/default.nix

2014-11-06 10:16:39 +01:00

..

admin

Turn more licenses into lib.licenses style

2014-11-06 00:48:16 +00:00

archivers

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

audio

update gvolicon

2014-10-18 19:18:43 +02:00

backup

bareos: Add derivation

2014-11-04 11:11:14 -08:00

bluetooth

obexd: update from 0.47 to 0.48

2014-10-07 21:50:40 +02:00

cd-dvd

xorriso: update from 1.3.4 to 1.3.8

2014-10-07 21:50:40 +02:00

compression

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

filesystems

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

graphics

Turn more licenses into lib.licenses style

2014-11-06 00:48:16 +00:00

inputmethods

Create wrapper package for fcitx with plugins.

2014-11-05 10:37:10 +09:00

misc

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

networking

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

package-management

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

security

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

system

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

text

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

typesetting

Merge remote-tracking branch 'origin/master' into staging

2014-11-06 10:16:39 +01:00

video

change md5sum to sha256sum for a few packages

2014-10-12 16:13:21 +02:00

virtualization

Turn more licenses into lib.licenses style

2014-11-06 00:48:16 +00:00

X11

Turn more licenses into lib.licenses style

2014-11-06 00:48:16 +00:00