Find a file
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
doc Fix link 2012-10-18 10:10:49 -04:00
maintainers svn path=/nixpkgs/trunk/; revision=32961 2012-03-09 17:53:04 +00:00
pkgs Merge minor updates from jcumming. 2012-10-21 12:26:29 +02:00
.gitignore Tell git to ignore .*.swp - Vim swap files 2012-10-04 11:27:57 +04:00
COPYING * Applying an MIT-style license to Nixpkgs. 2006-04-25 16:50:34 +00:00
default.nix * For convenience, provide a top-level Nix expression that simply 2007-04-26 14:32:57 +00:00
VERSION * Bump version number. 2012-06-04 03:53:25 +00:00