summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-03-23 07:22:44 +0100
committerGitHub <noreply@github.com>2017-03-23 07:22:44 +0100
commit5e0d0f4944f312875b722dc42a58e3a9c6aa92bd (patch)
treed6547961ae954e502f2e71f514c23b0d87fee0fb /pkgs
parente77d1aaca2326aa5e47f0d16b590b3c1162e6c19 (diff)
parent89e2a4c390ff2a0daeadc09477958805f4d205fb (diff)
downloadnixpkgs-5e0d0f4944f312875b722dc42a58e3a9c6aa92bd.tar
nixpkgs-5e0d0f4944f312875b722dc42a58e3a9c6aa92bd.tar.gz
nixpkgs-5e0d0f4944f312875b722dc42a58e3a9c6aa92bd.tar.bz2
nixpkgs-5e0d0f4944f312875b722dc42a58e3a9c6aa92bd.tar.lz
nixpkgs-5e0d0f4944f312875b722dc42a58e3a9c6aa92bd.tar.xz
nixpkgs-5e0d0f4944f312875b722dc42a58e3a9c6aa92bd.tar.zst
nixpkgs-5e0d0f4944f312875b722dc42a58e3a9c6aa92bd.zip
Merge pull request #24234 from ndowens/master
gphoto2: 2.5.8 -> 2.5.11
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/gphoto2/default.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 742bdaad996..46278f42e7b 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,17 +3,17 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2-2.5.8";
+  name = "gphoto2-2.5.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "0kgfql6c64ha1gahjdwlqhmkslnfywmc2fkys4c5682zv4awvax9";
+    sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r";
   };
 
-  nativeBuildInputs = [ pkgconfig gettext ];
-  buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
+  nativeBuildInputs = [ pkgconfig gettext libtool ];
+  buildInputs = [ libgphoto2 libexif popt libjpeg readline ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A ready to use set of digital camera software applications";
     longDescription = ''
 
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
 
     '';
     homepage = http://www.gphoto.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; unix;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.jcumming ];
   };
 }