diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
commit | bde20f3e881049c9d019eb34c07d6194b20b0042 (patch) | |
tree | f24782e55ca68a214d0fe7585097d97a6aa687dd /pkgs/applications/misc | |
parent | 6a29a56c1277d80aa65e063f34a179c847e6d8b4 (diff) | |
parent | 50d66b945ee5aceae2bbf2eb791487e18ac9d374 (diff) | |
download | nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.gz nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.bz2 nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.lz nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.xz nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.zst nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.zip |
Merge branch 'master' into x-updates
Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/gphoto2/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/gphoto2/gphotofs.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 7c732ab677ae..827488260260 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,16 +3,16 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.4.14"; - + name = "gphoto2-2.5.1"; + src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47"; + sha256 = "12zn677fvw1bmx70pg0vck2vrvkiy7hx1wzlwf6k23mhdnm4ipad"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; - + meta = { description = "a ready to use set of digital camera software applications"; longDescription = '' diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index dc760b8e80b9..32c95ec147bd 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -1,11 +1,11 @@ -a : -let +a : +let fetchurl = a.fetchurl; 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; [ - libgphoto2 fuse pkgconfig glib + libgphoto2 fuse pkgconfig glib libtool ]; in rec { @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - + name = "gphoto2fs-" + version; meta = { description = "Fuse FS to mount a digital camera"; diff --git a/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix b/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix index 2e350b9232f5..1a4cceb6279b 100644 --- a/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix @@ -1,6 +1,6 @@ rec { - advertisedUrl="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2"; - version = "0.4.0"; - url="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2"; - hash = "07zxnawkyzy6np9zas6byp9ksjkbi16d11zqrznqarfkf3fkg3yq"; + advertisedUrl="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2"; + version = "0.5.0"; + url="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2"; + hash = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7"; } |