Vladimír Čunát 74488e2b58 Merge branch 'x-updates' into stdenv-updates ... Conflicts (simple): pkgs/development/libraries/glib/default.nix pkgs/development/libraries/mesa/default.nix		2013-09-02 15:44:57 +02:00
..
admin	Move namePrefix="" python packages out of python-packges.nix	2013-07-31 13:34:11 +02:00
archivers	Merge branch 'origin/master' into stdenv.	2013-08-17 10:00:16 +02:00
audio	acoustid-fingerprinter: Add new package, v0.6.	2013-08-14 20:50:58 +02:00
backup	duply: platforms.unix -> platforms.linux	2013-08-22 22:06:45 +02:00
bluetooth	update obexftp, required for new openobex	2013-08-28 21:20:56 +02:00
cd-dvd	unmaintain several packages	2013-08-16 23:45:01 +02:00
compression	xz: Update to 5.0.5	2013-08-26 14:25:51 +02:00
filesystems	Merge branch 'origin/master' into stdenv.	2013-08-17 10:00:16 +02:00
graphics	Merge branch 'x-updates' into stdenv-updates	2013-09-02 15:44:57 +02:00
inputmethods/fcitx	add fcitx-4.2.7	2013-01-28 11:35:03 +08:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-08-30 10:45:11 +02:00
networking	Merge branch 'x-updates' into stdenv-updates	2013-09-02 15:44:57 +02:00
package-management	nixUnstable: Update to 1.6pre3187_3fb7ae0	2013-08-12 14:22:16 +02:00
security	gnupg: update to version 2.0.21	2013-08-21 15:08:05 +02:00
system	vboot_reference: add meta attributes and cleanups	2013-08-28 21:52:07 +02:00
text	Merge branch 'origin/master' into stdenv-updates.	2013-08-26 12:21:23 +02:00
typesetting	Merge branch 'master' into x-updates	2013-08-22 19:29:09 +02:00
video	unmaintain several packages	2013-08-16 23:45:01 +02:00
virtualization	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
X11	unmaintain several packages	2013-08-16 23:45:01 +02:00