diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 10:25:14 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 10:25:14 +0100 |
commit | 7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566 (patch) | |
tree | f10b8dd05c774ed6cf9afba85426abbf4527f2a0 /pkgs/development/libraries/gegl | |
parent | f08e3e38d4bf983480fcde77911136bab70d8e80 (diff) | |
parent | 7e8454fb856573967a70f61116e15f879f2e3f6a (diff) | |
download | nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.gz nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.bz2 nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.lz nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.xz nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.zst nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/gegl')
-rw-r--r-- | pkgs/development/libraries/gegl/4.0.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 75897b036bf..b3e8ec2e178 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -63,6 +63,9 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch"; sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly"; }) + + # Remove gegl:simple / backend-file test that times out frequently + ./patches/no-simple-backend-file-test.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch new file mode 100644 index 00000000000..bf07572182b --- /dev/null +++ b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch @@ -0,0 +1,10 @@ +diff --git a/tests/simple/meson.build b/tests/simple/meson.build +index 2c735d80a..ae4d50f2a 100644 +--- a/tests/simple/meson.build ++++ b/tests/simple/meson.build +@@ -1,5 +1,4 @@ + testnames = [ +- 'backend-file', + 'buffer-cast', + 'buffer-changes', + 'buffer-extract', |