Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1dcf798daebf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c52cc1953c8c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 22, 2020

  1. gegl_0_4: try to fix tests timing out

    @jtojnar
    jtojnar committed Apr 22, 2020
    Copy the full SHA
    a2bdcd7 View commit details

  2. Merge pull request #85812 from jtojnar/gegl-timeout

    @jtojnar
    jtojnar authored Apr 22, 2020
    Copy the full SHA
    c52cc19 View commit details
Showing with 7 additions and 12 deletions.
  1. +7 −2 pkgs/development/libraries/gegl/4.0.nix
  2. +0 −10 pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch
9 changes: 7 additions & 2 deletions pkgs/development/libraries/gegl/4.0.nix
View file
Original file line number Diff line number Diff line change
@@ -46,8 +46,13 @@ stdenv.mkDerivation rec {
};

patches = [
# Remove gegl:simple / backend-file test that times out frequently
./patches/no-simple-backend-file-test.patch
# 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 = "8PlUcLQkuskjDGCA2obUPDW3jE++A6B5YWVgvn+GFrU=";
})
];

nativeBuildInputs = [
10 changes: 0 additions & 10 deletions pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch
View file

This file was deleted.