nixpkgs

History

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 1db34880d71152229c91225b734cac2ffc909810 (libgphoto). Signed-off-by: aszlig <aszlig@redmoonstudios.org>	2012-10-21 12:26:29 +02:00
..
default.nix	Merge minor updates from jcumming.	2012-10-21 12:26:29 +02:00

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
   1db34880d71152229c91225b734cac2ffc909810 (libgphoto).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2012-10-21 12:26:29 +02:00

default.nix

Merge minor updates from jcumming.

2012-10-21 12:26:29 +02:00