public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39301 from markus1189/libgphoto2 

(lib)gphoto2: 2.5.1{5,6} -> 2.5.17
This commit is contained in:
Jörg Thalheim 2018-04-23 11:54:57 +01:00 committed by GitHub
parent dd486e64e5 294f823146
commit e2b5e17791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/gphoto2/default.nix
View File

@ -3,11 +3,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gphoto2-2.5.15"; name = "gphoto2-2.5.17";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf"; sha256 = "0kslwclyyzvnxjw3gdzhlagj7l5f8lba833ipr9s0s0c4hwi0mxa";
}; };
nativeBuildInputs = [ pkgconfig gettext libtool ]; nativeBuildInputs = [ pkgconfig gettext libtool ];

6
pkgs/development/libraries/libgphoto2/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
owner = "gphoto"; owner = "gphoto";
repo = "libgphoto2"; repo = "libgphoto2";
rev = "${meta.tag}"; rev = "${meta.tag}";
sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9"; sha256 = "0pbfg89817qkb35mmajsw2iz6j9nhkkj67m419f8x8yxpqkaa0wb";
}; };
patches = []; patches = [];
@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
MTP, and other vendor specific protocols for controlling and transferring data MTP, and other vendor specific protocols for controlling and transferring data
from digital cameras. from digital cameras.
''; '';
version = "2.5.16"; version = "2.5.17";
tag = "libgphoto2-2_5_16-release"; tag = "libgphoto2-2_5_17-release";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
license = stdenv.lib.licenses.lgpl21Plus; license = stdenv.lib.licenses.lgpl21Plus;
platforms = with stdenv.lib.platforms; unix; platforms = with stdenv.lib.platforms; unix;