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

gphoto*: update for changed libgphoto version

Browse Source
This commit is contained in:
Vladimír Čunát 2013-04-20 12:44:05 +02:00
parent 3da96b38cd
commit 7a25aa94cd
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,16 +3,16 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gphoto2-2.4.14"; name = "gphoto2-2.5.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47"; sha256 = "12zn677fvw1bmx70pg0vck2vrvkiy7hx1wzlwf6k23mhdnm4ipad";
}; };
nativeBuildInputs = [ pkgconfig gettext ]; nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
meta = { meta = {
description = "a ready to use set of digital camera software applications"; description = "a ready to use set of digital camera software applications";
longDescription = '' longDescription = ''

10
pkgs/applications/misc/gphoto2/gphotofs.nix
View File

@ -1,11 +1,11 @@
a : a :
let let
fetchurl = a.fetchurl; fetchurl = a.fetchurl;
s = import ./src-info-for-gphotofs.nix; s = import ./src-info-for-gphotofs.nix;
version = a.lib.attrByPath ["version"] s.version a; version = a.lib.attrByPath ["version"] s.version a;
buildInputs = with a; [ buildInputs = with a; [
libgphoto2 fuse pkgconfig glib libgphoto2 fuse pkgconfig glib libtool
]; ];
in in
rec { rec {
@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"]; phaseNames = ["doConfigure" "doMakeInstall"];
name = "gphoto2fs-" + version; name = "gphoto2fs-" + version;
meta = { meta = {
description = "Fuse FS to mount a digital camera"; description = "Fuse FS to mount a digital camera";

8
pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix
View File

@ -1,6 +1,6 @@
rec { rec {
advertisedUrl="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2"; advertisedUrl="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2";
version = "0.4.0"; version = "0.5.0";
url="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2"; url="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2";
hash = "07zxnawkyzy6np9zas6byp9ksjkbi16d11zqrznqarfkf3fkg3yq"; hash = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
} }

2
pkgs/top-level/all-packages.nix
View File

@ -7185,7 +7185,7 @@ let
gphoto2 = callPackage ../applications/misc/gphoto2 { }; gphoto2 = callPackage ../applications/misc/gphoto2 { };
gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix { gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix {
inherit libgphoto2 fuse pkgconfig glib; inherit libgphoto2 fuse pkgconfig glib libtool;
}; };
graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };