diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/ncmpcpp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/gphoto2/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/libgphoto2/default.nix | 14 |
4 files changed, 40 insertions, 14 deletions
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 3af9bc7690f..a7fca8cabf1 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}: stdenv.mkDerivation rec { - version = "0.5.8"; + version = "0.5.10"; name = "ncmpcpp-${version}"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; - sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx"; + sha256 = "ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8"; }; buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ]; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 9fff2943d30..022cb437c69 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,17 +3,27 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.4.11"; + name = "gphoto2-2.4.14"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0ah42b7rnqh0z8bb96z7cdycxdh5k19h6lmfc02kdhrhqdr3q81y"; + sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47"; }; buildNativeInputs = [ pkgconfig gettext ]; buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; meta = { + description = "a ready to use set of digital camera software applications"; + longDescription = '' + + A set of command line utilities for manipulating over 1400 different + digital cameras. Through libgphoto2, it supports PTP, MTP, and much more.. + + ''; homepage = http://www.gphoto.org/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index fc554dcd875..64d769fab75 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,21 +1,29 @@ -{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs +{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz , sharutils }: stdenv.mkDerivation rec { - name = "libarchive-2.8.3"; + name = "libarchive-3.0.4"; src = fetchurl { - url = "http://libarchive.googlecode.com/files/${name}.tar.gz"; - sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; + url = "https://github.com/downloads/libarchive/libarchive/${name}.tar.gz"; + sha256 = "76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac"; }; - propagatedBuildInputs = [ libxml2 zlib bzip2 openssl ] ++ + propagatedBuildInputs = [ libxml2 zlib bzip2 openssl xz ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; buildInputs = [ sharutils ]; meta = { - description = "A library for reading and writing streaming archives"; - homepage = http://people.freebsd.org/~kientzle/libarchive; + description = "Multi-format archive and compression library"; + longDescription = '' + This library has code for detecting and reading many archive formats and + compressions formats including (but not limited to) tar, shar, cpio, zip, and + compressed with gzip, bzip2, lzma, xz, .. + ''; + homepage = http://libarchive.github.com/; + license = stdenv.lib.licenses.bsd3; + platforms = with stdenv.lib.platforms; all; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 16001e689dd..b55da62c9fb 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.4.11"; + name = "libgphoto2-2.4.14"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "08y40mqy714cg0160lny13z9kyxm63m3ksg8hljy5pspxanbn5ji"; + sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; }; buildNativeInputs = [ pkgconfig gettext ]; @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; description = "A library for accessing digital cameras"; - license = "LGPL 2.1"; + 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 ]; }; } |