Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
admin	Fix many package descriptions	2014-08-24 22:31:37 +02:00
archivers	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
audio	fix mpdcron	2014-10-16 11:03:10 +02:00
backup	rsnapshot: set meta.platforms	2014-10-01 22:29:33 +02: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-10-16 15:16:50 +02:00
filesystems	squashfsTools: update from 4.2 to 4.3, potentially fixes CVE-2012-4024, CVE-2012-4025	2014-10-08 20:23:25 +02:00
graphics	logstalgia: update from 1.0.5 to 1.0.6	2014-10-16 09:06:20 +02:00
inputmethods	fcitx: update from 4.2.8.4 to 4.2.8.5	2014-09-30 11:14:23 +01:00
misc	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
networking	Merge branch 'strongswan-charon-cmd' of github.com:ftrvxmtrx/nixpkgs	2014-10-14 09:54:28 -04:00
package-management	cabal-install: jailbreak version 1.16.0.2 to build with random 1.x	2014-10-14 17:39:35 +02:00
security	Update: trousers 0.3.11 -> 0.3.13	2014-10-14 09:00:31 +02:00
system	New package: runit 2.1.2	2014-10-15 13:08:22 +02:00
text	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
typesetting	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
video	change md5sum to sha256sum for a few packages	2014-10-12 16:13:21 +02:00
virtualization	remove pythonPackages.ssl reference	2014-10-11 20:29:17 +02:00
X11	change md5sum to sha256sum for a few packages	2014-10-12 16:13:21 +02:00