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: 2fad5fefec8b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 47fbc9cc7880
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 15, 2017

  1. shotwell: 0.23.5 -> 0.25.2 

    (cherry picked from commit 5e3c4b2)
    @fpletz
    mimadrid authored and fpletz committed Feb 15, 2017
    Copy the full SHA
    4d73cd3 View commit details

  2. shotwell: 0.25.2 -> 0.25.5 

    (cherry picked from commit e3d7ce8)
    @fpletz
    mimadrid authored and fpletz committed Feb 15, 2017
    3
    Copy the full SHA
    47fbc9c View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/graphics/shotwell/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/graphics/shotwell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

stdenv.mkDerivation rec {
version = "${major}.${minor}";
major = "0.23";
major = "0.25";
minor = "5";
name = "shotwell-${version}";

src = fetchurl {
url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
sha256 = "0fgs1rgvkmy79bmpxrsvm5w8rvqml4l1vnwma0xqx5zzm02p8a07";
sha256 = "10pv3v789hky8h7ladqzzmgvkmgy3c41n4xz0nnyjmpycwl26g29";
};

NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
which udev libgudev gnome3.gexiv2 hicolor_icon_theme
libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
wrapGAppsHook gnome_doc_utils gnome3.rest
wrapGAppsHook gnome_doc_utils gnome3.rest gnome3.gcr
gnome3.defaultIconTheme itstool ];

meta = with stdenv.lib; {