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

leo-editor: 5.6 -> 5.7.3, fix build #46589

Merged
merged 1 commit into from Sep 13, 2018
Merged

leo-editor: 5.6 -> 5.7.3, fix build #46589

merged 1 commit into from Sep 13, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Sep 12, 2018 •
edited

Motivation for this change

ZHF #45960.
Previous version depended on qt56.qtwebengine which is broken.

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)
  • Fits CONTRIBUTING.md.

@xeji
leo-editor: 5.6 -> 5.7.3, fix build
d72ed7f 
Previous version depended on qt56.qtwebengine which was broken.
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: leo-editor

Partial log (click to expand)

/nix/store/sds7dhp4xn7lysbayv9mmj1ifahmvkkh-leo-editor-5.7.3/share/leo-editor/leo/plugins/leo_babel/examples/slowOut.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python"
/nix/store/sds7dhp4xn7lysbayv9mmj1ifahmvkkh-leo-editor-5.7.3/share/leo-editor/leo/plugins/leo_babel/tests/tests.py: interpreter directive changed from "/usr/bin/python3" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python3"
/nix/store/sds7dhp4xn7lysbayv9mmj1ifahmvkkh-leo-editor-5.7.3/share/leo-editor/leo/plugins/leo_babel/babel_kill.py: interpreter directive changed from "/usr/bin/python3" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python3"
/nix/store/sds7dhp4xn7lysbayv9mmj1ifahmvkkh-leo-editor-5.7.3/share/leo-editor/leo/scripts/leo: interpreter directive changed from "/usr/bin/env python" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python"
/nix/store/sds7dhp4xn7lysbayv9mmj1ifahmvkkh-leo-editor-5.7.3/share/leo-editor/leo/external/saveleo: interpreter directive changed from "/usr/bin/python" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python"
/nix/store/sds7dhp4xn7lysbayv9mmj1ifahmvkkh-leo-editor-5.7.3/share/leo-editor/leo/extensions/hooks/commit-msg: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/sds7dhp4xn7lysbayv9mmj1ifahmvkkh-leo-editor-5.7.3/share/leo-editor/leo/extensions/hooks/pre-commit: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/sds7dhp4xn7lysbayv9mmj1ifahmvkkh-leo-editor-5.7.3...
postPatchMkspecs
/nix/store/sds7dhp4xn7lysbayv9mmj1ifahmvkkh-leo-editor-5.7.3

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: leo-editor

Partial log (click to expand)

  CMakeLists.txt:137 (include)


-- Configuring incomplete, errors occurred!
See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeOutput.log".
See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeError.log".
builder for '/nix/store/6cb8n4maf0cmcfl9m0rz1jg7w0krav07-qtwebkit-5.212-alpha-01-26-2018.drv' failed with exit code 1
cannot build derivation '/nix/store/xva5j9njvmzwk28pnp4sl6ls56pnwi6z-python3.6-PyQt-5.10.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/c92xscys6nqg1vhpiar9x1xp4qpxgjgr-leo-editor-5.7.3.drv': 1 dependencies couldn't be built
error: build of '/nix/store/c92xscys6nqg1vhpiar9x1xp4qpxgjgr-leo-editor-5.7.3.drv' failed

@GrahamcOfBorg
Copy link

Timed out, unknown build status on aarch64-linux (full log)

Attempted: leo-editor

Partial log (click to expand)

[ 68%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSIDBTransaction.cpp.o
[ 68%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSIDBVersionChangeEvent.cpp.o
[ 68%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSWorkerGlobalScopeIndexedDatabase.cpp.o
[ 68%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSUIRequestEvent.cpp.o
[ 68%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSMediaControlsHost.cpp.o
[ 68%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSHTMLMediaElementMediaSession.cpp.o
building of '/nix/store/w2mi5hdppz7wn93gc066x6ddclfpdwxa-qtwebkit-5.212-alpha-01-26-2018.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/s4v9hgwl1q8hggrpyajlkphdnk3b990z-python3.6-PyQt-5.10.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/kvili59wgk7ryshx2iv6zlgpn9fws3db-leo-editor-5.7.3.drv': 1 dependencies couldn't be built
error: build of '/nix/store/kvili59wgk7ryshx2iv6zlgpn9fws3db-leo-editor-5.7.3.drv' failed

@xeji
Copy link
Contributor Author

xeji commented Sep 13, 2018

cc @dtzWill

@dtzWill
Copy link
Member

dtzWill commented Sep 13, 2018

LGTM!

I haven't used leo actively for a while, but this builds and everything seemed fine poking at leo files I had around.

@xeji
Copy link
Contributor Author

xeji commented Sep 13, 2018

Thanks!

@xeji
Copy link
Contributor Author

xeji commented Sep 13, 2018

We should get rid of all the qt56 stuff anyway 😄

@xeji xeji merged commit eb88142 into NixOS:master Sep 13, 2018
@xeji xeji deleted the p/leo-editor branch September 13, 2018 10:17
xeji added a commit that referenced this pull request Sep 13, 2018
@xeji
leo-editor: 5.6 -> 5.7.3, fix build (#46589)
17f538b 
Previous version depended on qt56.qtwebengine which was broken.

(cherry picked from commit eb88142)
@xeji
Copy link
Contributor Author

xeji commented Sep 13, 2018

backported: 17f538b

@xeji xeji mentioned this pull request Sep 13, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 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
@xeji @GrahamcOfBorg @dtzWill