diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-10-21 12:15:13 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-10-21 12:26:29 +0200 |
| commit | 6dd94d680a0a379dce9e1b10ae561cce01a5671a (patch) | |
| tree | 912b20e48695c6121a74b128795071af1ab002e9 /pkgs/os-specific/linux/sysfsutils | |
| parent | 006af75c174f76a6722a22641afd6f369f5f32a8 (diff) | |
| parent | d8006ae36854215819092ddfd678766586600d39 (diff) | |
| parent | 1db34880d71152229c91225b734cac2ffc909810 (diff) | |
| parent | fe6d7bc9077fdee8da266523b47b1309d8b8e3ee (diff) | |
| download | nixpkgs-6dd94d680a0a379dce9e1b10ae561cce01a5671a.tar nixpkgs-6dd94d680a0a379dce9e1b10ae561cce01a5671a.tar.gz nixpkgs-6dd94d680a0a379dce9e1b10ae561cce01a5671a.tar.bz2 nixpkgs-6dd94d680a0a379dce9e1b10ae561cce01a5671a.tar.lz nixpkgs-6dd94d680a0a379dce9e1b10ae561cce01a5671a.tar.xz nixpkgs-6dd94d680a0a379dce9e1b10ae561cce01a5671a.tar.zst nixpkgs-6dd94d680a0a379dce9e1b10ae561cce01a5671a.zip | |
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>