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

git-cola: port to qt5 #40371

Merged
merged 1 commit into from May 11, 2018
Merged

git-cola: port to qt5 #40371

merged 1 commit into from May 11, 2018

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented May 11, 2018 •
edited

Motivation for this change

git-cola is a simple GUI git wrapper based on QT. Since 2.7
(namely git-cola/git-cola@293364b)
it supports QT5 which provides a nicer inteface.

See #33248

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@Ma27
git-cola: port to qt5
1a69587 
`git-cola` is a simple GUI `git` wrapper based on QT. Since 2.7
(namely git-cola/git-cola@293364b)
it supports QT5 which provides a nicer inteface.

See NixOS#33248
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: git-cola

Partial log (click to expand)

strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/mhi1jl84wbvymy2dxgcf1h4y2qafm07h-git-cola-3.1/lib  /nix/store/mhi1jl84wbvymy2dxgcf1h4y2qafm07h-git-cola-3.1/bin
patching script interpreter paths in /nix/store/mhi1jl84wbvymy2dxgcf1h4y2qafm07h-git-cola-3.1
/nix/store/mhi1jl84wbvymy2dxgcf1h4y2qafm07h-git-cola-3.1/share/git-cola/bin/ssh-askpass-darwin: interpreter directive changed from " /bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/mhi1jl84wbvymy2dxgcf1h4y2qafm07h-git-cola-3.1/share/git-cola/bin/git-xbase: interpreter directive changed from "/usr/bin/env python" to "/nix/store/l9j2jsc9flrbmpf799nw9wdq59gpwms8-python-2.7.14/bin/python"
/nix/store/mhi1jl84wbvymy2dxgcf1h4y2qafm07h-git-cola-3.1/share/git-cola/bin/ssh-askpass: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/mhi1jl84wbvymy2dxgcf1h4y2qafm07h-git-cola-3.1...
wrapping `/nix/store/mhi1jl84wbvymy2dxgcf1h4y2qafm07h-git-cola-3.1/bin/git-cola'...
wrapping `/nix/store/mhi1jl84wbvymy2dxgcf1h4y2qafm07h-git-cola-3.1/bin/git-dag'...
postPatchMkspecs

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: git-cola

Partial log (click to expand)

[5828/17529] CC obj/third_party/ffmpeg/ffmpeg_internal/buffer.o
[5829/17529] CXX obj/third_party/pdfium/fxge/cfx_gemodule.o
[5830/17529] CC obj/third_party/ffmpeg/ffmpeg_internal/aac_parser.o
[5831/17529] CXX obj/third_party/pdfium/fxge/cttfontdesc.o
[5832/17529] CXX obj/services/service_manager/public/interfaces/interfaces_blink/service.mojom-blink.o
[5833/17529] CC obj/third_party/ffmpeg/ffmpeg_internal/mux.o
building of '/nix/store/j8zfhsjxn7vkm8lzps9202wa0skjnygx-qtwebengine-5.10.1.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/gaqsi99f9grnn17860b8c9fip9543hym-python2.7-PyQt-5.10.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/wn9d7l6ciya7dk0094a7ph5jyxr43a0j-git-cola-3.1.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/wn9d7l6ciya7dk0094a7ph5jyxr43a0j-git-cola-3.1.drv' failed

@dotlambda dotlambda merged commit 45ce588 into NixOS:master May 11, 2018
@Ma27 Ma27 deleted the git-cola/qt5-port branch May 11, 2018 18:09
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
@Ma27 @GrahamcOfBorg @dotlambda