subsurface: 4.7.2 -> 4.7.5 #33251
Merged
subsurface: 4.7.2 -> 4.7.5 #33251
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also updates googlemaps to 2017-12-15 and fixes compilation with qt5.10.
|
@GrahamcOfBorg build subsurface |
There was a problem hiding this comment.
Failure for system: x86_64-darwin
while evaluating the attribute ‘__impureHostDeps’ of the derivation ‘qtconnectivity-5.9.3’ at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating ‘unique’ at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/lib/lists.nix:455:12, called from /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/stdenv/generic/make-derivation.nix:89:13:
while evaluating ‘concatMap’ at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/lib/lists.nix:102:18, called from /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/stdenv/generic/make-derivation.nix:89:25:
while evaluating anonymous function at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/stdenv/generic/make-derivation.nix:89:40, called from undefined position:
while evaluating ‘getOutput’ at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/lib/attrsets.nix:450:23, called from undefined position:
while evaluating anonymous function at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/stdenv/generic/make-derivation.nix:63:15, called from undefined position:
while evaluating ‘callPackageWith’ at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/lib/customisation.nix:113:35, called from /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/top-level/all-packages.nix:12401:12:
while evaluating ‘makeOverridable’ at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/lib/customisation.nix:72:24, called from /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/lib/customisation.nix:117:8:
while evaluating anonymous function at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/os-specific/linux/bluez/default.nix:1:1, called from /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/lib/customisation.nix:74:12:
assertion failed at /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-zoidberg/pkgs/os-specific/linux/bluez/default.nix:5:1
There was a problem hiding this comment.
Success for system: x86_64-linux
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/hjy6p3l1ip65kx3dbxb5qsw66f87v8qi-subsurface-4.7.5
shrinking /nix/store/hjy6p3l1ip65kx3dbxb5qsw66f87v8qi-subsurface-4.7.5/bin/.subsurface-wrapped
stripping (with flags -S) in /nix/store/hjy6p3l1ip65kx3dbxb5qsw66f87v8qi-subsurface-4.7.5/bin
patching script interpreter paths in /nix/store/hjy6p3l1ip65kx3dbxb5qsw66f87v8qi-subsurface-4.7.5
checking for references to /tmp/nix-build-subsurface-4.7.5.drv-0 in /nix/store/hjy6p3l1ip65kx3dbxb5qsw66f87v8qi-subsurface-4.7.5...
postPatchMkspecs
postMoveQtStaticLibs
/nix/store/hjy6p3l1ip65kx3dbxb5qsw66f87v8qi-subsurface-4.7.5
There was a problem hiding this comment.
Success for system: aarch64-linux
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/yss7gmxlnqbgkp1wkwk33dm1r4xivasj-subsurface-4.7.5
shrinking /nix/store/yss7gmxlnqbgkp1wkwk33dm1r4xivasj-subsurface-4.7.5/bin/.subsurface-wrapped
stripping (with flags -S) in /nix/store/yss7gmxlnqbgkp1wkwk33dm1r4xivasj-subsurface-4.7.5/bin
patching script interpreter paths in /nix/store/yss7gmxlnqbgkp1wkwk33dm1r4xivasj-subsurface-4.7.5
checking for references to /build in /nix/store/yss7gmxlnqbgkp1wkwk33dm1r4xivasj-subsurface-4.7.5...
postPatchMkspecs
postMoveQtStaticLibs
/nix/store/yss7gmxlnqbgkp1wkwk33dm1r4xivasj-subsurface-4.7.5
|
It seems like you based this on an old master. |
|
Still, this includes a compilation fix for Qt5.10 (presumably adding |
|
@yegortimoshenko It's a good fix. It just has to be rebased on current master with a new commit message. |
|
GitHub seems to be able to merge it without rebase. New commit message can be supplied when using "Squash and merge". |
|
Thanks for merging it anyway :) |
|
And yeah, the googlemaps upgrade is needed for qt 5.10. |
|
@bkchr Does the map widget work for you? I get during runtime, and only a white map instead of tiles… Not that into QT, but it seems like the type used in MapWidget.qml:21 doesn't exist… |
|
@flokli are you on Linux or MacOs? The following error seems to be similar: subsurface/subsurface#588 Maybe we also need to fix that on our side. |
|
@bkchr I'm on NixOS, not MacOS. is also shown in the stdout - sorry, missed this one. So it looks pretty much the same as the linked issue. Build logs show: So yes, this might need patching from our side. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also updates googlemaps to 2017-12-15 and fixes compilation with qt5.10.
Motivation for this change
Preparation for qt5.10
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)