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: 3d4942c7318c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7ed3bd4007ed
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 4, 2019

  1. openjpeg: disable tests for aarch64 linux 

    Fails on hydra https://hydra.nixos.org/build/98332124
    @worldofpeace
    worldofpeace committed Aug 4, 2019
    Copy the full SHA
    06c7770 View commit details

  2. Merge pull request #65926 from worldofpeace/openjpeg/disable-tests-aa… 

    …rch64

openjpeg: disable tests for aarch64 linux
    @worldofpeace
    worldofpeace authored Aug 4, 2019
    Copy the full SHA
    7ed3bd4 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/libraries/openjpeg/generic.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/openjpeg/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {

propagatedBuildInputs = [ libpng libtiff lcms2 ];

doCheck = testsSupport;
doCheck = (testsSupport && !stdenv.isAarch64); # tests fail on aarch64-linux
checkPhase = ''
substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \
--replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # "