JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12067 from mdorman/shotwellupdate

Browse Source 
shotwell: 0.20.2 -> 0.22.0
This commit is contained in:
Pascal Wittmann 2016-01-08 11:07:46 +01:00
commit 43ae5ad38c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/graphics/shotwell/default.nix
View File

@ -6,12 +6,12 @@
# for dependencies see http://www.yorba.org/projects/shotwell/install/
stdenv.mkDerivation rec {
version = "0.20.2";
version = "0.22.0";
name = "shotwell-${version}";
src = fetchurl {
url = "mirror://gnome/sources/shotwell/0.20/${name}.tar.xz";
sha256 = "0h5pdczsrkplvlvq54zk3am4kjmfpd6pn2sz0ky8lfq1fngwiqip";
url = "mirror://gnome/sources/shotwell/0.22/${name}.tar.xz";
sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81";
};
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Popular photo organizer for the GNOME desktop";
homepage = http://www.yorba.org/projects/shotwell/;
homepage = https://wiki.gnome.org/Apps/Shotwell;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [iElectric];
platforms = platforms.linux;

4
pkgs/top-level/all-packages.nix
View File

@ -3039,7 +3039,9 @@ let
sharutils = callPackage ../tools/archivers/sharutils { };
shotwell = callPackage ../applications/graphics/shotwell { };
shotwell = callPackage ../applications/graphics/shotwell {
vala = vala_0_28;
};
shout = callPackage ../applications/networking/irc/shout { };