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
..
compilers	Update Lazarus	2012-10-17 22:24:39 +04:00
eclipse	update ecj to 3.7.2	2012-08-25 19:39:19 +02:00
guile-modules	Drop 'gnomevfs = gnome_vfs;' alias	2011-10-08 12:06:03 +00:00
interpreters	Merge remote-tracking branch 'origin/master' into x-updates	2012-10-15 12:16:58 -04:00
libraries	Merge minor updates from jcumming.	2012-10-21 12:26:29 +02:00
misc	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
ocaml-modules	Update ocamlnet to version 3.6. (Does not compile under 4.00.0 though.)	2012-10-09 14:03:12 -04:00
perl-modules	DBD::SQLite: Don't link against /usr/lib/libsqlite3.dylib on Darwin	2012-09-12 12:33:03 -04:00
python-modules	Gajim: make OpenSSL code work	2012-09-13 18:03:50 +04:00
ruby-modules	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
tools	haskell-cabal2nix: update to version 1.40	2012-10-15 20:23:43 +02:00
web	build-node-package: make fewer assumptions about the name of the node tarball	2012-09-20 14:45:31 -04:00