about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-04-23 11:54:57 +0100
committerGitHub <noreply@github.com>2018-04-23 11:54:57 +0100
commite2b5e17791368b7f69b609b61fb0d408e767d4fb (patch)
treea9c1e1f5167d2a72558a863ae939f03bb0a3d3b7 /pkgs
parentdd486e64e52b583a45fdba29b3b286b5ced24594 (diff)
parent294f823146aa1961f493d0c2f408872e9b2d34cb (diff)
downloadnixlib-e2b5e17791368b7f69b609b61fb0d408e767d4fb.tar
nixlib-e2b5e17791368b7f69b609b61fb0d408e767d4fb.tar.gz
nixlib-e2b5e17791368b7f69b609b61fb0d408e767d4fb.tar.bz2
nixlib-e2b5e17791368b7f69b609b61fb0d408e767d4fb.tar.lz
nixlib-e2b5e17791368b7f69b609b61fb0d408e767d4fb.tar.xz
nixlib-e2b5e17791368b7f69b609b61fb0d408e767d4fb.tar.zst
nixlib-e2b5e17791368b7f69b609b61fb0d408e767d4fb.zip
Merge pull request #39301 from markus1189/libgphoto2
(lib)gphoto2: 2.5.1{5,6} -> 2.5.17
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/gphoto2/default.nix4
-rw-r--r--pkgs/development/libraries/libgphoto2/default.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 77e7b592f647..5131e0739e73 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2-2.5.15";
+  name = "gphoto2-2.5.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf";
+    sha256 = "0kslwclyyzvnxjw3gdzhlagj7l5f8lba833ipr9s0s0c4hwi0mxa";
   };
 
   nativeBuildInputs = [ pkgconfig gettext libtool ];
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 9c0ea4a3a73e..96b42ac068cc 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     owner = "gphoto";
     repo = "libgphoto2";
     rev = "${meta.tag}";
-    sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9";
+    sha256 = "0pbfg89817qkb35mmajsw2iz6j9nhkkj67m419f8x8yxpqkaa0wb";
   };
 
   patches = [];
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras.
     '';
-    version = "2.5.16";
-    tag = "libgphoto2-2_5_16-release";
+    version = "2.5.17";
+    tag = "libgphoto2-2_5_17-release";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;