Merge pull request #12067 from mdorman/shotwellupdate

shotwell: 0.20.2 -> 0.22.0

+7 -5
+4 -4
pkgs/applications/graphics/shotwell/default.nix
··· 6 6 # for dependencies see http://www.yorba.org/projects/shotwell/install/ 7 7 8 8 stdenv.mkDerivation rec { 9 - version = "0.20.2"; 9 + version = "0.22.0"; 10 10 name = "shotwell-${version}"; 11 11 12 12 src = fetchurl { 13 - url = "mirror://gnome/sources/shotwell/0.20/${name}.tar.xz"; 14 - sha256 = "0h5pdczsrkplvlvq54zk3am4kjmfpd6pn2sz0ky8lfq1fngwiqip"; 13 + url = "mirror://gnome/sources/shotwell/0.22/${name}.tar.xz"; 14 + sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81"; 15 15 }; 16 16 17 17 NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; ··· 44 44 45 45 meta = with stdenv.lib; { 46 46 description = "Popular photo organizer for the GNOME desktop"; 47 - homepage = http://www.yorba.org/projects/shotwell/; 47 + homepage = https://wiki.gnome.org/Apps/Shotwell; 48 48 license = licenses.lgpl21Plus; 49 49 maintainers = with maintainers; [iElectric]; 50 50 platforms = platforms.linux;
+3 -1
pkgs/top-level/all-packages.nix
··· 3039 3039 3040 3040 sharutils = callPackage ../tools/archivers/sharutils { }; 3041 3041 3042 - shotwell = callPackage ../applications/graphics/shotwell { }; 3042 + shotwell = callPackage ../applications/graphics/shotwell { 3043 + vala = vala_0_28; 3044 + }; 3043 3045 3044 3046 shout = callPackage ../applications/networking/irc/shout { }; 3045 3047