Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ec64973bc3a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: af334fe875d2
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 20, 2018

  1. ocaml ≤ 4.05: mark as broken on Aarch64 (#47010) 

    (cherry picked from commit ce03af9)
    @vbgl @xeji
    vbgl authored and xeji committed Sep 20, 2018
    Copy the full SHA
    355a037 View commit details

  2. 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
Showing with 5 additions and 3 deletions.
  1. +4 −2 nixos/tests/gdk-pixbuf.nix
  2. +1 −1 pkgs/development/compilers/ocaml/generic.nix
6 changes: 4 additions & 2 deletions nixos/tests/gdk-pixbuf.nix
View file
Original file line number Diff line number Diff line change
@@ -10,10 +10,12 @@ import ./make-test.nix ({ pkgs, ... }: {
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];

virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE
# Tests allocate a lot of memory trying to exploit a CVE
# but qemu-system-i386 has a 2047M memory limit
virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096;
};

testScript = ''
$machine->succeed("gnome-desktop-testing-runner");
$machine->succeed("gnome-desktop-testing-runner -t 1800"); # increase timeout to 1800s
'';
})
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ocaml/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ stdenv.mkDerivation (args // rec {
'';

platforms = with platforms; linux ++ darwin;
broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast major_version "4.06";
broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06";
};

})