3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications
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
..
audio Merge minor updates from jcumming. 2012-10-21 12:26:29 +02:00
display-managers/slim slim: Really update to 1.3.4 2012-08-17 11:33:59 -04:00
editors Merge branch 'master' into x-updates. 2012-10-12 15:24:24 +02:00
graphics Update pqiv 2012-10-18 00:34:09 +04:00
misc Merge minor updates from jcumming. 2012-10-21 12:26:29 +02:00
networking skype: Fix syntax error in .desktop-file 2012-10-19 09:53:06 +02:00
office gnucash: Update to 2.4.11 2012-10-09 11:24:38 -04:00
science stellarium: update to version 0.11.4 2012-10-19 10:19:41 +02:00
taxes * It's that time of year again. 2012-03-10 19:23:04 +00:00
version-management git: update to version 1.7.12.4 2012-10-19 10:08:07 +02:00
video VLC: update to v2.0.4 2012-10-19 18:57:19 +02:00
virtualization Move lxc from "applications/virtualization" to "os-specific/linux". 2012-10-20 12:36:44 +02:00
window-managers Merge remote-tracking branch 'origin/master' into x-updates 2012-10-03 14:43:10 -04:00