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

qutebrowser: patch all python scripts #46556

Merged
merged 6 commits into from Sep 12, 2018
Merged

qutebrowser: patch all python scripts #46556

merged 6 commits into from Sep 12, 2018

Conversation

rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Sep 12, 2018

Motivation for this change

Try to patch python scripts once and for all.
This adds all the remaining dependencies needed by qutebrowser {user,}scripts.

Things done
  • Tested using sandboxing (nix.useSandbox on 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
  • Tested compilation of all pkgs that depend on this change (mitmproxy fails but was already broken)
  • Tested execution of all binary files
  • Determined the impact on package closure size (≈1.03)
  • Fits CONTRIBUTING.md (new python modules need a maintainer).

cc: @dustinlacewell (thank you for reporting the issue)

@rnhmjoj rnhmjoj requested a review from FRidh as a code owner September 12, 2018 01:59
@dustinlacewell
Copy link

This is excellent. Thanks so much for this work.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: qutebrowser

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-linux (full log)

Attempted: qutebrowser

Partial log (click to expand)

/nix/store/bssx4lqhfcs6vlhi85viz47ibs1s58iq-qutebrowser-1.4.2/share/qutebrowser/scripts/testbrowser_webkit.py: interpreter directive changed from "/usr/bin/env python3" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python3"
/nix/store/bssx4lqhfcs6vlhi85viz47ibs1s58iq-qutebrowser-1.4.2/share/qutebrowser/scripts/dictcli.py: interpreter directive changed from "/usr/bin/env python3" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python3"
/nix/store/bssx4lqhfcs6vlhi85viz47ibs1s58iq-qutebrowser-1.4.2/share/qutebrowser/scripts/importer.py: interpreter directive changed from "/usr/bin/env python3" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python3"
/nix/store/bssx4lqhfcs6vlhi85viz47ibs1s58iq-qutebrowser-1.4.2/share/qutebrowser/scripts/open_url_in_instance.sh: interpreter directive changed from "/bin/bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/bssx4lqhfcs6vlhi85viz47ibs1s58iq-qutebrowser-1.4.2/share/qutebrowser/scripts/testbrowser_webengine.py: interpreter directive changed from "/usr/bin/env python3" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python3"
/nix/store/bssx4lqhfcs6vlhi85viz47ibs1s58iq-qutebrowser-1.4.2/share/qutebrowser/scripts/link_pyqt.py: interpreter directive changed from "/usr/bin/env python3" to "/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/bin/python3"
checking for references to /build in /nix/store/bssx4lqhfcs6vlhi85viz47ibs1s58iq-qutebrowser-1.4.2...
wrapping `/nix/store/bssx4lqhfcs6vlhi85viz47ibs1s58iq-qutebrowser-1.4.2/bin/.qutebrowser-wrapped'...
postPatchMkspecs
/nix/store/bssx4lqhfcs6vlhi85viz47ibs1s58iq-qutebrowser-1.4.2

@GrahamcOfBorg
Copy link

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

Attempted: qutebrowser

Partial log (click to expand)

/build/source/Source/WebCore/platform/qt/ScrollbarThemeQStyle.cpp: In function 'WebCore::ScrollbarPart WebCore::scrollbarPart(const WebCore::QStyleFacade::SubControl&)':
/build/source/Source/WebCore/platform/qt/ScrollbarThemeQStyle.cpp:76:12: warning: enumeration value 'SC_ScrollBarFirst' not handled in switch [-Wswitch]
     switch (sc) {
            ^
/build/source/Source/WebCore/platform/qt/ScrollbarThemeQStyle.cpp:76:12: warning: enumeration value 'SC_ScrollBarLast' not handled in switch [-Wswitch]
/build/source/Source/WebCore/platform/qt/ScrollbarThemeQStyle.cpp:76:12: warning: enumeration value 'SC_ScrollBarGroove' not handled in switch [-Wswitch]
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/m1glxd3xhzxkang4msxyk0xwp3imfjan-qutebrowser-1.4.2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/m1glxd3xhzxkang4msxyk0xwp3imfjan-qutebrowser-1.4.2.drv' failed

@xeji
Copy link
Contributor

xeji commented Sep 12, 2018

Please rebase this on current master because recently merged #46535 made a change regarding qutebrowser script path. I think you do the same, and github doesn't report a conflict, but let's not merge the same change twice...

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Sep 12, 2018

@xeji I saw that PR: there is no conflict, it's actually a different change.

@xeji
Copy link
Contributor

xeji commented Sep 12, 2018

OK, sorry, I was mistaken.

@xeji xeji merged commit decd819 into NixOS:master Sep 12, 2018
@rnhmjoj rnhmjoj deleted the lastpass branch February 23, 2019 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xeji xeji xeji approved these changes

@FRidh FRidh Awaiting requested review from FRidh

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@rnhmjoj @dustinlacewell @GrahamcOfBorg @xeji