From 3529567ed4bfd62e2190aab5565534e451b15d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 14 Nov 2014 18:00:04 +0100 Subject: [PATCH] libgphoto-2.4: remove the old unneeded version --- pkgs/development/libraries/libgphoto2/2.4.nix | 30 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/development/libraries/libgphoto2/2.4.nix diff --git a/pkgs/development/libraries/libgphoto2/2.4.nix b/pkgs/development/libraries/libgphoto2/2.4.nix deleted file mode 100644 index 3edc8d0ac6ca..000000000000 --- a/pkgs/development/libraries/libgphoto2/2.4.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: - -stdenv.mkDerivation rec { - name = "libgphoto2-2.4.14"; - - src = fetchurl { - url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; - }; - - nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg ]; - - # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb libexif ]; - - meta = { - homepage = http://www.gphoto.org/proj/libgphoto2/; - description = "A library for accessing digital cameras"; - longDescription = '' - This is the library backend for gphoto2. It contains the code for PTP, - MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. - ''; - # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00427ecc2c73..650d741fde8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5823,8 +5823,6 @@ let libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; - libgphoto2_4 = callPackage ../development/libraries/libgphoto2/2.4.nix { }; - libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; };