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

Commits on Mar 31, 2018

  1. nixos testing: significantly reduce deps needed for OCR tests

    Instead of imagemagick built with many libraries
    (notably librsvg which these days requires rust)
    use imagemagick_light with support for libtiff added.
    dtzWill committed Mar 31, 2018
    Copy the full SHA
    ddd10e0 View commit details
  2. Merge pull request #38181 from dtzWill/feature/lighter-imagemagick-fo…

    …r-NixOS-tests
    
    nixos testing: significantly reduce deps needed for OCR tests
    dtzWill authored Mar 31, 2018
    Copy the full SHA
    a5358e3 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 nixos/lib/testing.nix
4 changes: 3 additions & 1 deletion nixos/lib/testing.nix
Original file line number Diff line number Diff line change
@@ -111,6 +111,8 @@ in rec {

ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; };

imagemagick_tiff = imagemagick_light.override { inherit libtiff; };

# Generate onvenience wrappers for running the test driver
# interactively with the specified network, and for starting the
# VMs from the command line.
@@ -128,7 +130,7 @@ in rec {
wrapProgram $out/bin/nixos-test-driver \
--add-flags "''${vms[*]}" \
${lib.optionalString enableOCR
"--prefix PATH : '${ocrProg}/bin:${imagemagick}/bin'"} \
"--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
--run "export testScript=\"\$(cat $out/test-script)\"" \
--set VLANS '${toString vlans}'
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms