mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 10:00:56 +00:00
6dd94d680a
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
|
||
---|---|---|
.. | ||
compilers | ||
eclipse | ||
guile-modules | ||
interpreters | ||
libraries | ||
misc | ||
ocaml-modules | ||
perl-modules | ||
python-modules | ||
ruby-modules | ||
tools | ||
web |