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
base: 355a0377b113
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: af334fe875d2
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 20, 2018

  1. nixos/tests/gdk-pixbuf: fix test on i686 (#46916) 

    Test didn't run because it tried to create a VM with 4096M RAM
but qemu-system-i386 has a hard 2047M memory limit.
- reduce memory to 2047M on i686.
- increase timeout 300s -> 1800s because the tests are much slower
  on i686 and timed out.

(cherry picked from commit e40d850)
    @xeji
    xeji committed Sep 20, 2018
    Copy the full SHA
    af334fe View commit details
    Browse the repository at this point in the history