about summary refs log tree commit diff
path: root/pkgs/development/libraries/gegl
diff options
context:
space:
mode:
authorR. RyanTM <ryantm-bot@ryantm.com>2019-05-15 12:46:29 -0700
committerRenaud <c0bw3b@users.noreply.github.com>2019-05-15 21:46:29 +0200
commit0ff5e227afedd5142f93f2d7c162ec33f642e459 (patch)
tree4e555ba36c73c15d34b2d2b3d47e969e8e4fdc66 /pkgs/development/libraries/gegl
parent91872f537caaec7118fe4c66209045ae211fa2dc (diff)
downloadnixlib-0ff5e227afedd5142f93f2d7c162ec33f642e459.tar
nixlib-0ff5e227afedd5142f93f2d7c162ec33f642e459.tar.gz
nixlib-0ff5e227afedd5142f93f2d7c162ec33f642e459.tar.bz2
nixlib-0ff5e227afedd5142f93f2d7c162ec33f642e459.tar.lz
nixlib-0ff5e227afedd5142f93f2d7c162ec33f642e459.tar.xz
nixlib-0ff5e227afedd5142f93f2d7c162ec33f642e459.tar.zst
nixlib-0ff5e227afedd5142f93f2d7c162ec33f642e459.zip
gegl_0_4: 0.4.14 -> 0.4.16 (#61292)
* gegl_0_4: 0.4.14 -> 0.4.16
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gegl/versions

* gegl_0_4: drop Darwin patches
They were merged upstream and shipped with v0.4.16
Diffstat (limited to 'pkgs/development/libraries/gegl')
-rw-r--r--pkgs/development/libraries/gegl/4.0.nix32
1 files changed, 3 insertions, 29 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index da20438fb4bb..4215f0ebc30d 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -1,45 +1,19 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
+{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
 , librsvg, pango, gtk, bzip2, json-glib, gettext, autoreconfHook, libraw
 , gexiv2, libwebp, gnome3, libintl }:
 
 stdenv.mkDerivation rec {
   pname = "gegl";
-  version = "0.4.14";
+  version = "0.4.16";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "00crhngwi07f5b9x77kx5p7p4cl6l5g6glpz9rqv7pfqk62xa0ac";
+    sha256 = "0njydcr6qdmfzh4fxx544681qxdpf7y6b2f47jcypn810dlxy4h1";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
-    # Make the Darwin patches below apply cleanly
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gegl/commit/141a7aa76cd36143f624f06b1c43d2483945653c.patch;
-      sha256 = "0ijv9ra6723jn60krjwzbc6l9qr08h76bsz9xgddvfgsgr1nnpbi";
-    })
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gegl/commit/b3ff0df080d133bbdb394c3db40d4f9d2980a8a6.patch;
-      sha256 = "0im0rqk8mz9vi7qqx06vj4wm5hjwv1544jwdaaywlcrs9g266hl0";
-    })
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gegl/commit/fe756be6f0c776a45201a61f67d3e5e42f6398de.patch;
-      sha256 = "0h3rqwfsph2gisbwvc2v5a9r5b0djcxlm790xpi6yfndj42b0v2b";
-    })
-    # Fix build on Darwin
-    # https://gitlab.gnome.org/GNOME/gegl/merge_requests/28
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gegl/commit/ac331b5c0e3d940b64bb811b0f54e86c7d312917.patch;
-      sha256 = "1yj9jh8q9cbr1szrxhdapknk4nfhbkbc1njv50ifrj7vyfislj34";
-    })
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gegl/commit/d05eb01170728f45f561ca937708a293e29e02d9.patch;
-      sha256 = "0gwz12sm8kkmzyxsiq0sl30cabs5q0ckj743yrzimspkhrvc1ya2";
-    })
-  ];
-
   enableParallelBuilding = true;
 
   doCheck = true;