diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 9fff2943d305..022cb437c698 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,17 +3,27 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.4.11"; + name = "gphoto2-2.4.14"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0ah42b7rnqh0z8bb96z7cdycxdh5k19h6lmfc02kdhrhqdr3q81y"; + sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47"; }; buildNativeInputs = [ pkgconfig gettext ]; buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; meta = { + description = "a ready to use set of digital camera software applications"; + longDescription = '' + + A set of command line utilities for manipulating over 1400 different + digital cameras. Through libgphoto2, it supports PTP, MTP, and much more.. + + ''; homepage = http://www.gphoto.org/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 16001e689ddb..94944052845a 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.4.11"; + name = "libgphoto2-2.4.14"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "08y40mqy714cg0160lny13z9kyxm63m3ksg8hljy5pspxanbn5ji"; + sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; }; buildNativeInputs = [ pkgconfig gettext ]; @@ -17,6 +17,16 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; description = "A library for accessing digital cameras"; - license = "LGPL 2.1"; + longDescription = '' + This is the library backend for gphoto2. It contains the code for PTP, + MTP, and other vendor specific protocols for controlling and transferring data + from digital cameras. + ''; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } + +# XXX: the homepage claims LGPL, and the several src files I audited were +# lgpl21Plus