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.

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

monero{,-gui}: 0.16.0.3 -> 0.17.0.1 #99662

Merged
merged 7 commits into from Oct 8, 2020
Merged

monero{,-gui}: 0.16.0.3 -> 0.17.0.1 #99662

merged 7 commits into from Oct 8, 2020

Conversation

prusnak
Copy link
Member

@prusnak prusnak commented Oct 5, 2020 •
edited

Motivation for this change

Version update to support the upcoming hard-fork (October 17th)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@prusnak prusnak requested a review from mmahut as a code owner October 5, 2020 21:30
@ofborg ofborg bot requested review from rnhmjoj and ehmry October 5, 2020 21:40
@rnhmjoj
Copy link
Contributor

rnhmjoj commented Oct 6, 2020

Oh, thank you. I have been tracking the release of monero-gui but it caught me sleeping.
Uhm, monero-gui is not building

  src/libwalletqt/QRCodeImageProvider.cpp:29:10: fatal error: QrCode.hpp: No such file or directory
     29 | #include "QrCode.hpp"
        |          ^~~~~~~~~~~~
  compilation terminated.
  make: *** [Makefile:2078: QRCodeImageProvider.o] Error 1
  make: *** Waiting for unfinished jobs....

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Oct 6, 2020

Ok, apparently they have just moved from qmake to cmake only. The package needs a couple tweaks, working on it.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Oct 6, 2020

It took longer than expected due to the long compile time but it's done.

@prusnak
Copy link
Member Author

prusnak commented Oct 6, 2020 •
edited

@rnhmjoj Can you please turn on the trezorSupport by default (like it was before the change)?

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Oct 6, 2020

Yes, sorry: I forgot it off while testing.

rnhmjoj
rnhmjoj approved these changes Oct 7, 2020
View reviewed changes
Copy link
Contributor

@rnhmjoj rnhmjoj left a comment •
edited

Choose a reason for hiding this comment

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

Looks all good, aarch64 too.

EDIT: actually no. Looks like monero-gui is trying to use the in-tree version of randomx and failing to build it on aarch64.

@rnhmjoj
monero: force use of system libraries
cc90474
@rnhmjoj
monero: export patched sources
59fe3e8 
This is needed to build monero-gui without duplicating code.
@rnhmjoj
monero-gui: use the cmake build system
059292c
@rnhmjoj
monero: apply patch to fix monero-gui build
b5ca332 
This is a more appropriate solution to fix a
build error in monero-gui.
@ofborg ofborg bot requested a review from rnhmjoj October 8, 2020 00:39
@rnhmjoj
Copy link
Contributor

rnhmjoj commented Oct 8, 2020 •
edited

I pretty much had to restart from scratch: I figured monero was using a bundled library instead of our own, which failed to build on non-x86-64 systems. So, I patched monero to use ours and reused the patched sources in monero-gui as well.

Also, the architecture string has to be manually specified using -DARCH. I hardcoded the most common ones because it looks like they are different from the one in lib.platforms and I don't how else to get them.

Now both monero and monero-gui should build at least on i686-linux, x86_64-linux and aarch64-linux.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Oct 8, 2020 •
edited

Tested the daemon and bootstrapping a node with monero-gui and everything is working. I'm merging.

@rnhmjoj rnhmjoj merged commit 2c9ffee into NixOS:master Oct 8, 2020
@rnhmjoj
Copy link
Contributor

rnhmjoj commented Oct 8, 2020

Backported to 20.09 (11b8241..305ff0c)

@prusnak prusnak deleted the monero branch October 9, 2020 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmahut mmahut Awaiting requested review from mmahut mmahut is a code owner

@ehmry ehmry Awaiting requested review from ehmry

@rnhmjoj rnhmjoj Awaiting requested review from rnhmjoj

Assignees
No one assigned
Labels
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
2 participants
@prusnak @rnhmjoj