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
|
||
---|---|---|
.. | ||
adobe-reader | ||
audio | ||
bibletime | ||
bitcoin | ||
blender | ||
calibre | ||
cdrtools | ||
d4x | ||
djvulibre | ||
dmenu | ||
eaglemode | ||
epdfview | ||
evince | ||
evopedia | ||
fetchmail | ||
freemind | ||
get_iplayer | ||
girara | ||
gkrellm | ||
gnome_terminator | ||
goldendict | ||
googleearth | ||
gosmore | ||
gphoto2 | ||
gpsbabel | ||
gpscorrelate | ||
grass | ||
grip | ||
gv | ||
gxneur | ||
hello | ||
htmldoc | ||
ikiwiki | ||
jbidwatcher | ||
jigdo | ||
k3b | ||
kde-wacomtablet | ||
keepassx | ||
krename | ||
krusader | ||
librecad | ||
lyx | ||
makeself | ||
merkaartor | ||
mrxvt | ||
multisync | ||
mupdf | ||
mysql-workbench | ||
navipowm | ||
navit | ||
nut | ||
openjump | ||
pgadmin | ||
pinfo | ||
procmail | ||
pstree | ||
qcad | ||
qgis | ||
redshift | ||
rsibreak | ||
rxvt | ||
rxvt_unicode | ||
sakura | ||
sbagen | ||
semnotes | ||
st | ||
stardict | ||
surf | ||
synergy | ||
tangogps | ||
taskjuggler | ||
taskwarrior | ||
thinking-rock | ||
truecrypt | ||
vifm | ||
viking | ||
vue | ||
wordnet | ||
xchm | ||
xfontsel | ||
xlsfonts | ||
xmobar | ||
xmove | ||
xneur | ||
xpdf | ||
xterm | ||
yakuake | ||
yate | ||
zathura |