1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00
nixpkgs/pkgs/development
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
..
compilers Update Lazarus 2012-10-17 22:24:39 +04:00
eclipse
guile-modules
interpreters Merge remote-tracking branch 'origin/master' into x-updates 2012-10-15 12:16:58 -04:00
libraries Merge minor updates from jcumming. 2012-10-21 12:26:29 +02:00
misc
ocaml-modules Update ocamlnet to version 3.6. (Does not compile under 4.00.0 though.) 2012-10-09 14:03:12 -04:00
perl-modules
python-modules
ruby-modules
tools haskell-cabal2nix: update to version 1.40 2012-10-15 20:23:43 +02:00
web