aszlig 6dd94d680a Merge minor updates from jcumming. ... This merges branches 'libarchive.121020', 'gphoto2.121020' and 'ncmpcpp.121020' of git://github.com/jcumming/nixpkgs. Octopus merge of @jcumming's minor updates, apart flrom updating the version, a few other changes were made to these packages as well: * libarchive: Now depends on xz. * libgphoto: License changed to LGPL 2.1 plus. And he did an overhaul of some of the meta blocks as well. Changes during this merge: * Inline and reword stray comment into meta tag in 1db34880d7 (libgphoto). Signed-off-by: aszlig <aszlig@redmoonstudios.org>		2012-10-21 12:26:29 +02:00
..
applications	Merge minor updates from jcumming.	2012-10-21 12:26:29 +02:00
build-support
data
desktops	Fix gvfs build	2012-10-15 12:13:39 -04:00
development	Merge minor updates from jcumming.	2012-10-21 12:26:29 +02:00
games	Update sgt-puzzles	2012-10-18 00:21:42 +04:00
lib
misc	jackaudio: Add extra download URL. Main site seems down.	2012-10-18 14:17:21 +02:00
os-specific	ipsec-tools: add version 0.8.0	2012-10-20 13:06:09 +02:00
servers	Fix xwd build	2012-10-19 13:50:02 +04:00
shells	bash-completion: remove NixOS-specific patch	2012-10-16 18:26:02 +02:00
stdenv
test
tools	Merge branch 'master' of github.com:NixOS/nixpkgs	2012-10-21 03:04:22 +02:00
top-level	Merge branch 'master' of github.com:NixOS/nixpkgs	2012-10-21 03:04:22 +02:00