Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e77d1aaca232
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e0d0f4944f3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 23, 2017

  1. gphoto2: 2.5.8 -> 2.5.11

    ndowens committed Mar 23, 2017
    Copy the full SHA
    89e2a4c View commit details

  2. Merge pull request #24234 from ndowens/master 

    gphoto2: 2.5.8 -> 2.5.11
    @7c6f434c
    7c6f434c authored Mar 23, 2017
    Copy the full SHA
    5e0d0f4 View commit details
Showing with 8 additions and 8 deletions.
  1. +8 −8 pkgs/applications/misc/gphoto2/default.nix
16 changes: 8 additions & 8 deletions pkgs/applications/misc/gphoto2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,17 +3,17 @@
}:

stdenv.mkDerivation rec {
name = "gphoto2-2.5.8";
name = "gphoto2-2.5.11";

src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "0kgfql6c64ha1gahjdwlqhmkslnfywmc2fkys4c5682zv4awvax9";
sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r";
};

nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
nativeBuildInputs = [ pkgconfig gettext libtool ];
buildInputs = [ libgphoto2 libexif popt libjpeg readline ];

meta = {
meta = with stdenv.lib; {
description = "A ready to use set of digital camera software applications";
longDescription = ''
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.gphoto.org/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; unix;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = [ maintainers.jcumming ];
};
}