git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #78269 from jtojnar/gimp-deps

gegl_0_4: 0.4.18 → 0.4.20

commit589044a71c1fe9731d3afbe1aa72658cce7daab9 authorJan Tojnar <jtojnar@gmail.com> dateThu 23 Jan 2020, 22:48 (7 years ago) parent9127ca2ee9d4c5
3 files changed+4−46
pkgs/development/libraries/babl/default.nix+2−8 pkgs/development/libraries/babl/fix-darwin.patch−16 pkgs/development/libraries/gegl/4.0.nix+2−22
pkgs/development/libraries/babl/default.nix+2−8
@@ -9,21 +9,15 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "babl";
12− version = "0.1.72";
12+ version = "0.1.74";
1313
1414 outputs = [ "out" "dev" ];
1515
1616 src = fetchurl {
1717 url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
18− sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4";
18+ sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs";
1919 };
2020
21− patches = [
22− # Apple linker does not know --version-script flag
23− # https://gitlab.gnome.org/GNOME/babl/merge_requests/26
24− ./fix-darwin.patch
25− ];
26−
2721 nativeBuildInputs = [
2822 meson
2923 ninja
pkgs/development/libraries/babl/fix-darwin.patchdeleted−16
@@ -1,16 +0,0 @@
1−diff --git a/babl/meson.build b/babl/meson.build
2−index b551c9a..f452435 100644
3−--- a/babl/meson.build
4−+++ b/babl/meson.build
5−@@ -24,9 +24,9 @@
6− ]
7−
8− # Linker arguments
9−-babl_link_args = [
10−+babl_link_args = cc.get_supported_link_arguments([
11− '-Wl,--version-script,' + version_script,
12−-]
13−+])
14− if platform_win32
15− babl_link_args += '-Wl,--no-undefined'
16− endif
pkgs/development/libraries/gegl/4.0.nix+2−22
@@ -33,37 +33,17 @@
3333
3434stdenv.mkDerivation rec {
3535 pname = "gegl";
36− version = "0.4.18";
36+ version = "0.4.20";
3737
3838 outputs = [ "out" "dev" "devdoc" ];
3939 outputBin = "dev";
4040
4141 src = fetchurl {
4242 url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
43− sha256 = "0r6akqnrkvxizyhyi8sv40mxm7j4bcwjb6mqjpxy0zzbbfsdyin9";
43+ sha256 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93";
4444 };
4545
4646 patches = [
47− # Fix arch detection.
48− # https://gitlab.gnome.org/GNOME/gegl/merge_requests/53
49− (fetchpatch {
50− url = "https://gitlab.gnome.org/GNOME/gegl/commit/6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8.patch";
51− sha256 = "0aqdr3y5mr47wq44jnhp97188bvpjlf56zrlmn8aazdf07r2apma";
52− })
53−
54− # Fix Darwin build.
55− # https://gitlab.gnome.org/GNOME/gegl/merge_requests/54
56− (fetchpatch {
57− url = "https://gitlab.gnome.org/GNOME/gegl/commit/2bc06bfedee4fb25f6a966c8235b75292e24e55f.patch";
58− sha256 = "1psls61wsrdq5pzpvj22mrm46lpzrw3wkx6li7dv6fyb65wz2n4d";
59− })
60−
61− # Fix test timeout. Downstream debian patch.
62− (fetchpatch {
63− url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch";
64− sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly";
65− })
66−
6747 # Remove gegl:simple / backend-file test that times out frequently
6848 ./patches/no-simple-backend-file-test.patch
6949 ];