Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perceptualdiff: init at 2.1 #51244

Merged
merged 1 commit into from Nov 30, 2018
Merged

perceptualdiff: init at 2.1 #51244

merged 1 commit into from Nov 30, 2018

Conversation

uri-canva
Copy link
Contributor

@uri-canva uri-canva commented Nov 29, 2018 •
edited

Motivation for this change

Adds perceptualdiff at 1.2, even though that isn't the latest available version, it is the latest available on Ubuntu which is what we're using right now.

Will update it after this version makes it into the cache.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@uri-canva uri-canva mentioned this pull request Nov 29, 2018
Closed
10 tasks
@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 29, 2018

If you need an old version from a binary cache for temp. usage you could use Cachix instead:
https://cachix.org/

@uri-canva
Copy link
Contributor Author

It's ok, it builds fast enough that I can build from source, will init at 2.1.

@uri-canva
Copy link
Contributor Author

Done.

@uri-canva uri-canva changed the title perceptualdiff: init at 1.2 perceptualdiff: init at 2.1 Nov 29, 2018
@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 29, 2018

@GrahamcOfBorg build perceptualdiff

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: perceptualdiff

Partial log (click to expand)

-- Install configuration: "Debug"
-- Installing: /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1/bin/perceptualdiff
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1
shrinking /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1/bin/perceptualdiff
strip is /nix/store/n4hb93w6j076xcjw5pm09rdmc09s075b-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1/bin
patching script interpreter paths in /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1
checking for references to /build in /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1...
/nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: perceptualdiff

Partial log (click to expand)

[ 85%] Building CXX object CMakeFiles/perceptualdiff.dir/perceptualdiff.o
[ 85%] Building CXX object CMakeFiles/perceptualdiff.dir/compare_args.o
[100%] Linking CXX executable perceptualdiff
/nix/store/3k95i31hc1cfvv45qgvrpmhvkxlvkg4j-freeimage-3.17.0/lib/libfreeimage.so: undefined reference to `png_init_filter_functions_neon'
collect2: error: ld returned 1 exit status
make[2]: *** [CMakeFiles/perceptualdiff.dir/build.make:101: perceptualdiff] Error 1
make[1]: *** [CMakeFiles/Makefile2:142: CMakeFiles/perceptualdiff.dir/all] Error 2
make: *** [Makefile:163: all] Error 2
builder for '/nix/store/gimqlwbziy0zgfv4b830vls0fvxfcmmk-perceptualdiff-2.1.drv' failed with exit code 2
error: build of '/nix/store/gimqlwbziy0zgfv4b830vls0fvxfcmmk-perceptualdiff-2.1.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: perceptualdiff

Partial log (click to expand)

[ 57%] Built target pdiff
[100%] Built target perceptualdiff
Install the project...
-- Install configuration: "Debug"
-- Installing: /nix/store/cx90mw1jhwh98is73ygva78vrnh2aib9-perceptualdiff-2.1/bin/perceptualdiff
post-installation fixup
strip is /nix/store/mvpvjar6m4jpjcz48715w2pax53djv6g-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/cx90mw1jhwh98is73ygva78vrnh2aib9-perceptualdiff-2.1/bin
patching script interpreter paths in /nix/store/cx90mw1jhwh98is73ygva78vrnh2aib9-perceptualdiff-2.1
/nix/store/cx90mw1jhwh98is73ygva78vrnh2aib9-perceptualdiff-2.1

@uri-canva
Copy link
Contributor Author

Setting up the virtualbox ubuntu image to test the build with sandboxing.

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 29, 2018 •
edited

Builds of the bot are sandboxed on Linux (it's the default since NixOS 18.09) and succeeded

It seems safe to restrict platforms to x86 because it fails on ARM.

@uri-canva
Copy link
Contributor Author

Oh it's arm, sorry I didn't notice that. Yes, let me do that.

@uri-canva
Copy link
Contributor Author

Done.

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 29, 2018

platforms.linux would still include aarch64-linux

You rather want platforms.x86 (includes any i686/amd64, linux or darwin)

@uri-canva
Copy link
Contributor Author

Done. Thanks!

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 30, 2018

@GrahamcOfBorg build perceptualdiff

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: perceptualdiff

Partial log (click to expand)

/nix/store/cx90mw1jhwh98is73ygva78vrnh2aib9-perceptualdiff-2.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: perceptualdiff

Partial log (click to expand)

-- Install configuration: "Debug"
-- Installing: /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1/bin/perceptualdiff
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1
shrinking /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1/bin/perceptualdiff
strip is /nix/store/n4hb93w6j076xcjw5pm09rdmc09s075b-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1/bin
patching script interpreter paths in /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1
checking for references to /build in /nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1...
/nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: perceptualdiff

Partial log (click to expand)

[ 85%] Building CXX object CMakeFiles/perceptualdiff.dir/compare_args.o
[ 85%] Building CXX object CMakeFiles/perceptualdiff.dir/perceptualdiff.o
[100%] Linking CXX executable perceptualdiff
/nix/store/3k95i31hc1cfvv45qgvrpmhvkxlvkg4j-freeimage-3.17.0/lib/libfreeimage.so: undefined reference to `png_init_filter_functions_neon'
collect2: error: ld returned 1 exit status
make[2]: *** [CMakeFiles/perceptualdiff.dir/build.make:101: perceptualdiff] Error 1
make[1]: *** [CMakeFiles/Makefile2:142: CMakeFiles/perceptualdiff.dir/all] Error 2
make: *** [Makefile:163: all] Error 2
builder for '/nix/store/gimqlwbziy0zgfv4b830vls0fvxfcmmk-perceptualdiff-2.1.drv' failed with exit code 2
error: build of '/nix/store/gimqlwbziy0zgfv4b830vls0fvxfcmmk-perceptualdiff-2.1.drv' failed

@uri-canva
Copy link
Contributor Author

Sorry I somehow missed the change on the previous push. Pushed now.

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 30, 2018

@GrahamcOfBorg build perceptualdiff

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: perceptualdiff

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: perceptualdiff

Partial log (click to expand)

/nix/store/cx90mw1jhwh98is73ygva78vrnh2aib9-perceptualdiff-2.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: perceptualdiff

Partial log (click to expand)

/nix/store/bpy781j3q1q8j8921vbzgqkyiqqlfz90-perceptualdiff-2.1

c0bw3b
c0bw3b approved these changes Nov 30, 2018
View reviewed changes
Copy link
Contributor

@c0bw3b c0bw3b left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally too. Builds and runs fine.

Thank your for the contribution!

@c0bw3b c0bw3b merged commit 4088758 into NixOS:master Nov 30, 2018
@uri-canva uri-canva deleted the perceptualdiff branch November 30, 2018 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c0bw3b c0bw3b c0bw3b approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@uri-canva @c0bw3b @GrahamcOfBorg