diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:02:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:02:21 +0200 |
| commit | 1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02 (patch) | |
| tree | bae982223d71e1d3760d022a26f2e06b7202e255 /pkgs/development/libraries/gegl/4.0.nix | |
| parent | 98f95ef9c4559c96cf852e5c0dae1d5124145a78 (diff) | |
| parent | 0905a5d99031c213c20c962e9501a2202602741b (diff) | |
| download | nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.gz nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.bz2 nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.lz nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.xz nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.zst nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/gegl/4.0.nix')
| -rw-r--r-- | pkgs/development/libraries/gegl/4.0.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 3b48a0968ea1..85699a8828b0 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -35,26 +35,16 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.22"; + version = "0.4.24"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q"; + sha256 = "d2VJnyc0Gw0WAy5mUxnLwSh2SD/2qUT83ySpxY4+JUo="; }; - patches = [ - # Prevent deadlock making tests time-out - # https://gitlab.gnome.org/GNOME/gegl/issues/226 - # https://gitlab.gnome.org/GNOME/glib/issues/1941 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/commit/1d530816266b52c8788bbe1504c5b2d6eceba036.patch"; - sha256 = "1d8nhrzvwq35c5ws00xy9y6bfd9wsj3dm0301hiwkfi4niq59ygh"; - }) - ]; - nativeBuildInputs = [ pkgconfig gettext |