Merge pull request #34428 from jtojnar/gegl-0.3.28

gegl_0_3: 0.3.26 → 0.3.28
This commit is contained in:
Jan Tojnar 2018-02-02 00:06:19 +01:00 committed by GitHub
commit a39fb2483b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 14 deletions

View file

@ -1,29 +1,37 @@
{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }:
{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3 }:
let
majorVersion = "0.10";
in
stdenv.mkDerivation rec {
name = "gexiv2-${version}";
version = "${majorVersion}.6";
version = "${majorVersion}.7";
src = fetchurl {
url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
sha256 = "09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk";
sha256 = "1f7312zygw77ml37i5qilhfvmjm59dn753ax71rcb2jm1p76vgcb";
};
patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=791941
(fetchurl {
url = https://bugzilla.gnome.org/attachment.cgi?id=365969;
sha256 = "06w744acgnz3hym7sm8c245yzlg05ldkmwgiz3yz4pp6h72brizj";
})
];
preConfigure = ''
patchShebangs .
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libtool m4 ];
nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ glib ];
propagatedBuildInputs = [ exiv2 ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/gexiv2;
description = "GObject wrapper around the Exiv2 photo metadata library";
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = gnome3.maintainers;
};
}

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "babl-0.1.38";
name = "babl-0.1.42";
src = fetchurl {
url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
sha256 = "11pfbyzq20596p9sgwraxspg3djg1jzz6wvz4bapf0yyr97jiyd0";
sha256 = "1wc7fyj9bfqfiwf1w33g3vv3wcl18pd9cxr9fc0iy391szrsynb8";
};
doCheck = true;

View file

@ -3,13 +3,15 @@
, libwebp, gnome3 }:
stdenv.mkDerivation rec {
name = "gegl-0.3.26";
name = "gegl-0.3.28";
src = fetchurl {
url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
sha256 = "1a9zbi6ws0r0sqynvg2fh3ad0ipnphg7w62y7whlcrbpqi29izvf";
sha256 = "1zr3gmmzjhp2d3d3h51x80r5q7gs9rv67ywx69sif6as99h8fbqm";
};
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
hardeningDisable = [ "format" ];
# needs fonts otherwise don't know how to pass them
@ -28,11 +30,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ];
meta = {
meta = with stdenv.lib; {
description = "Graph-based image processing framework";
homepage = http://www.gegl.org;
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ jtojnar ];
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}