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: 552b38ed7448
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 45a1974ab439
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 2, 2020

  1. gegl: remove flaky test 

    c.f. https://gitlab.gnome.org/GNOME/gegl/issues/215
    @lovesegfault
    lovesegfault committed Jan 2, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    lovesegfault Bernardo Meurer
    GPG key ID: E421C74191EA186C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    af29265 View commit details

  2. Merge pull request #76846 from lovesegfault/gegl-no-flaky-tests 

    gegl: remove flaky test
    @grahamc
    grahamc authored Jan 2, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    45a1974 View commit details
Showing with 13 additions and 0 deletions.
  1. +3 −0 pkgs/development/libraries/gegl/4.0.nix
  2. +10 −0 pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch
3 changes: 3 additions & 0 deletions pkgs/development/libraries/gegl/4.0.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
10 changes: 10 additions & 0 deletions pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch
View file
Original file line number Diff line number Diff line change
@@ -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',