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

Update Monero for upcoming hard fork (backports #48301) #48636

Merged
merged 7 commits into from Oct 20, 2018
Merged

Update Monero for upcoming hard fork (backports #48301) #48636

merged 7 commits into from Oct 20, 2018

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Oct 17, 2018 •
edited

Things done:

  • Built using sandbox
  • Cherry-picked using -x.

Backports #48301
This also cherry-picks #48634 since there apparently was an (upstream) issue with the 0.13.0.2 releases :/.
And finally, backports the previous updates, as there was a change (see comments).

cc @rnhmjoj

@samueldr
Copy link
Member Author

samueldr commented Oct 17, 2018 •
edited

@rnhmjoj ??!? I'm thinking I'm missing something obvious or something weird is going on.

(Disregard the current eval failure of ofborg. It's unrelated.)

monero not monero-gui this time seems to fail; but it did build on master locally and on ofborg!

 $ exec env -i NIXPKGS_ALLOW_UNFREE=1 nix-build -A monero
these derivations will be built:
  /nix/store/r4ssxh5p7zmv6ld1n8jm5q1f62zmvday-source.drv
  /nix/store/znrxg5lkgvfbnj39hyfpxc2iblc2j864-monero-0.13.0.3.drv
building '/nix/store/r4ssxh5p7zmv6ld1n8jm5q1f62zmvday-source.drv'...

trying https://github.com/monero-project/monero/archive/v0.13.0.3.tar.gz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100   132    0   132    0     0    578      0 --:--:-- --:--:-- --:--:--   578
100 8412k    0 8412k    0     0  3195k      0 --:--:--  0:00:02 --:--:-- 3518k
unpacking source archive /build/v0.13.0.3.tar.gz
fixed-output derivation produced path '/nix/store/bwacxn0dswn1xqy1pkqnynfrlwlqjas2-source' with sha256 hash '18hlnq5hp3m91r7w7kx2bpqmr18nj8cshba6psrpxrvklgaxjzs0' instead of the expected hash '03qx8y74zxnmabdi5r3a274pp8zvm3xhkdwi1xf5sb40vf4sfmwb'
cannot build derivation '/nix/store/znrxg5lkgvfbnj39hyfpxc2iblc2j864-monero-0.13.0.3.drv': 1 dependencies couldn't be built
error: build of '/nix/store/znrxg5lkgvfbnj39hyfpxc2iblc2j864-monero-0.13.0.3.drv' failed
Command exited with non-zero status 1

Any idea of anything I could have overlooked?

Should we now add both the friggin' commit IDs AND the tag names on fetchFromGitHub to reduce doubts? Did fetchFromGitHub change on master (or on stable)?

(Again, not directed at anyone in particular, I just don't know what I'm looking at here.)

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Oct 17, 2018 •
edited

monero needs fetchgit because some dep is in a submodule IIRC. here it's using fetchFromGithub.

@samueldr
Copy link
Member Author

samueldr commented Oct 17, 2018 •
edited

Ah right, I did overlook something. If I had looked and backported all commits instead of resolving the merge conflict I would have seen fetchgit. Thanks, I'll do that later.

@rnhmjoj @samueldr
monero: 0.12.0.0 -> 0.12.3.0
f430eaa 
(cherry picked from commit 90ab6c8)
@rnhmjoj @samueldr
monero-gui: 0.12.0.0 -> 0.12.3.0
ea0853e 
(cherry picked from commit fd95d30)
@rnhmjoj @samueldr
monero: 0.12.3.0 -> 0.13.0.2
6dda50f 
(cherry picked from commit 028164e)
@rnhmjoj @samueldr
xmr-stak: 2.4.7 -> 2.5.0
b183e85 
(cherry picked from commit 6dc4ae5)
@rnhmjoj @samueldr
monero-gui: 0.12.3.0 -> 0.13.0.2
fae2c59 
(cherry picked from commit 8e15e9c)
@rnhmjoj @samueldr
monero: 0.13.0.2 -> 0.13.0.3
636a475 
(cherry picked from commit 8929e03)
@rnhmjoj @samueldr
monero-gui: 0.13.0.2 -> 0.13.0.3
499f1c7 
(cherry picked from commit e57438f)
@samueldr
Copy link
Member Author

As ofborg might have issues right now with release-18.09 I'm attaching my own logs

@GrahamcOfBorg build monero-gui xmr-stak

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: monero-gui, xmr-stak

Partial log (click to expand)

shrinking /nix/store/dz7378h35cm3ix4vd7pdp09xg3x6wwy6-monero-gui-0.13.0.3/bin/monero-wallet-gui
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dz7378h35cm3ix4vd7pdp09xg3x6wwy6-monero-gui-0.13.0.3/bin
patching script interpreter paths in /nix/store/dz7378h35cm3ix4vd7pdp09xg3x6wwy6-monero-gui-0.13.0.3
checking for references to /build in /nix/store/dz7378h35cm3ix4vd7pdp09xg3x6wwy6-monero-gui-0.13.0.3...
postPatchMkspecs
postPatchMkspecs
postPatchMkspecs
/nix/store/dz7378h35cm3ix4vd7pdp09xg3x6wwy6-monero-gui-0.13.0.3
/nix/store/j3df9zqp16fs83ynwk87338f44d32hn8-xmr-stak-2.5.0

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: monero-gui

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

Partial log (click to expand)

clang++ -c -pipe -stdlib=libc++ -fPIC -fstack-protector -fstack-protector-strong -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -Wformat -Wformat-security -O2 -std=gnu++11 -Wall -W -fPIC -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I. -I/private/tmp/nix-build-monero-gui-0.13.0.3.drv-0/source/monero/include -Isrc/libwalletqt -Isrc/QR-Code-generator -Isrc -I/private/tmp/nix-build-monero-gui-0.13.0.3.drv-0/source/monero/src -isystem /nix/store/9nprgv6j52mkc0p5brk5sq670xsgdy5w-qtdeclarative-5.11.1-dev/include/QtQuick -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtWidgets -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtGui -isystem /nix/store/9nprgv6j52mkc0p5brk5sq670xsgdy5w-qtdeclarative-5.11.1-dev/include/QtQml -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtNetwork -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtCore -I. -I/nix/store/5wgzqjpki4xnn9vw1nvfshkpbdlddmwi-apple-framework-OpenGL/Library/Frameworks/OpenGL.framework/Headers -I/nix/store/h9n23fgzmxbi0337n0b9zzh8cbsgh1fv-apple-framework-AGL/Library/Frameworks/AGL.framework/Headers -I/nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/mkspecs/macx-clang -o moc_MainApp.o moc_MainApp.cpp
clang++ -c -pipe -stdlib=libc++ -fPIC -fstack-protector -fstack-protector-strong -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -Wformat -Wformat-security -O2 -std=gnu++11 -Wall -W -fPIC -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I. -I/private/tmp/nix-build-monero-gui-0.13.0.3.drv-0/source/monero/include -Isrc/libwalletqt -Isrc/QR-Code-generator -Isrc -I/private/tmp/nix-build-monero-gui-0.13.0.3.drv-0/source/monero/src -isystem /nix/store/9nprgv6j52mkc0p5brk5sq670xsgdy5w-qtdeclarative-5.11.1-dev/include/QtQuick -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtWidgets -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtGui -isystem /nix/store/9nprgv6j52mkc0p5brk5sq670xsgdy5w-qtdeclarative-5.11.1-dev/include/QtQml -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtNetwork -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtCore -I. -I/nix/store/5wgzqjpki4xnn9vw1nvfshkpbdlddmwi-apple-framework-OpenGL/Library/Frameworks/OpenGL.framework/Headers -I/nix/store/h9n23fgzmxbi0337n0b9zzh8cbsgh1fv-apple-framework-AGL/Library/Frameworks/AGL.framework/Headers -I/nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/mkspecs/macx-clang -o moc_DaemonManager.o moc_DaemonManager.cpp
clang++ -stdlib=libc++ -fstack-protector -fstack-protector-strong -pie -o release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui main.o filter.o clipboardAdapter.o oscursor.o WalletManager.o Wallet.o PendingTransaction.o TransactionHistory.o TransactionInfo.o QRCodeImageProvider.o oshelper.o TranslationManager.o TransactionHistoryModel.o TransactionHistorySortFilterModel.o BitBuffer.o QrCode.o QrSegment.o AddressBookModel.o AddressBook.o SubaddressModel.o Subaddress.o zxcvbn.o UnsignedTransaction.o Logger.o MainApp.o DaemonManager.o qrc_translations.o qrc_qml_qmlcache.o RightPanel_qml.o LeftPanel_qml.o version_js.o MiddlePanel_qml.o main_qml.o wizard_WizardConfigure_qml.o wizard_WizardDaemonSettings_qml.o wizard_WizardCreateViewOnlyWallet_qml.o wizard_WizardPassword_qml.o wizard_WizardPasswordInput_qml.o wizard_WizardMain_qml.o wizard_WizardRecoveryWallet_qml.o wizard_WizardOptions_qml.o wizard_WizardCreateWalletFromDevice_qml.o wizard_WizardManageWalletUI_qml.o wizard_WizardMemoTextInput_qml.o wizard_utils_js.o wizard_WizardWelcome_qml.o wizard_WizardCreateWallet_qml.o wizard_WizardFinish_qml.o wizard_WizardDonation_qml.o wizard_WizardPasswordUI_qml.o tabs_Twitter_qml.o tabs_tweetSearch_js.o tabs_TweetsModel_qml.o components_TipItem_qml.o components_PrivacyLevelSmall_qml.o components_DaemonConsole_qml.o components_RadioButton_qml.o components_InlineButton_qml.o components_DaemonManagerDialog_qml.o components_TickDelegate_qml.o components_TitleBar_qml.o components_NetworkStatusItem_qml.o components_LabelButton_qml.o components_MobileHeader_qml.o components_NewPasswordDialog_qml.o components_PasswordDialog_qml.o components_Scroll_qml.o components_TableDropdown_qml.o components_CheckBox_qml.o components_StandardDialog_qml.o components_PrivacyLevel_qml.o components_Style_qml.o components_LabelSubheader_qml.o components_WarningBox_qml.o components_TableHeader_qml.o components_InputDialog_qml.o components_IconButton_qml.o components_LineEdit_qml.o components_DashboardTable_qml.o components_HistoryTableInnerColumn_qml.o components_Label_qml.o components_DatePicker_qml.o components_StandardDropdown_qml.o components_HistoryTable_qml.o components_SearchInput_qml.o components_InputMulti_qml.o components_ProcessingSplash_qml.o components_RemoteNodeEdit_qml.o components_TextBlock_qml.o components_StandardButton_qml.o components_Notifier_qml.o components_AddressBookTable_qml.o components_HistoryTableMobile_qml.o components_ProgressBar_qml.o components_MenuButton_qml.o components_LineEditMulti_qml.o components_CheckBox2_qml.o components_QRCodeScanner_qml.o components_Input_qml.o js_Windows_js.o js_Utils_js.o js_TxUtils_js.o pages_Transfer_qml.o pages_Mining_qml.o pages_Sign_qml.o pages_AddressBook_qml.o pages_Dashboard_qml.o pages_Keys_qml.o pages_History_qml.o pages_SharedRingDB_qml.o pages_Receive_qml.o pages_TxKey_qml.o pages_settings_SettingsInfo_qml.o pages_settings_Navbar_qml.o pages_settings_Settings_qml.o pages_settings_SettingsLog_qml.o pages_settings_SettingsLayout_qml.o pages_settings_SettingsWallet_qml.o pages_settings_SettingsNode_qml.o qmlcache_loader.o moc_filter.o moc_clipboardAdapter.o moc_oscursor.o moc_WalletManager.o moc_Wallet.o moc_PendingTransaction.o moc_TransactionHistory.o moc_TransactionInfo.o moc_Transfer.o moc_NetworkType.o moc_oshelper.o moc_TranslationManager.o moc_TransactionHistoryModel.o moc_TransactionHistorySortFilterModel.o moc_AddressBookModel.o moc_AddressBook.o moc_SubaddressModel.o moc_Subaddress.o moc_UnsignedTransaction.o moc_MainApp.o moc_DaemonManager.o   -L/private/tmp/nix-build-monero-gui-0.13.0.3.drv-0/source/monero/lib -lwallet_merged -llmdb -lepee -lunbound -leasylogging -L/usr/local/lib -L/usr/local/opt/openssl/lib -L/usr/local/opt/boost/lib -lboost_serialization -lhidapi -lboost_thread-mt -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_chrono -lboost_program_options -lssl -lsodium -lcrypto -ldl -framework PCSC -lQt5Quick -L/lib -framework DiskArbitration -framework IOKit -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -framework OpenGL -framework AGL
clang-5.0: warning: argument unused during compilation: '-pie' [-Wunused-command-line-argument]
ld: warning: directory not found for option '-L/private/tmp/nix-build-monero-gui-0.13.0.3.drv-0/source/monero/lib'
ld: library not found for -lhidapi
clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation)
make: *** [Makefile:512: release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui] Error 1
builder for '/nix/store/li197nblb4a7xw04nw7xard8p830zy6d-monero-gui-0.13.0.3.drv' failed with exit code 2
error: build of '/nix/store/li197nblb4a7xw04nw7xard8p830zy6d-monero-gui-0.13.0.3.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: monero-gui, xmr-stak

Partial log (click to expand)

make[3]: *** [Makefile.gn_run:336: run_ninja] Error 1
make[3]: Leaving directory '/build/qtwebengine-everywhere-src-5.11.1/src/core'
make[2]: *** [Makefile:80: sub-gn_run-pro-make_first] Error 2
make[2]: Leaving directory '/build/qtwebengine-everywhere-src-5.11.1/src/core'
make[1]: *** [Makefile:79: sub-core-make_first] Error 2
make[1]: Leaving directory '/build/qtwebengine-everywhere-src-5.11.1/src'
make: *** [Makefile:47: sub-src-make_first] Error 2
builder for '/nix/store/10d68gmmjzyi03mgps7r0v1wvy8mpg6d-qtwebengine-5.11.1.drv' failed with exit code 2
cannot build derivation '/nix/store/dxz68ww6gm5rcnn7ni5axc9vlnz76q20-monero-gui-0.13.0.3.drv': 1 dependencies couldn't be built
error: build of '/nix/store/23lfx95bqq7pqabwppfmkig9878w54si-xmr-stak-2.5.0.drv', '/nix/store/dxz68ww6gm5rcnn7ni5axc9vlnz76q20-monero-gui-0.13.0.3.drv' failed

rnhmjoj
rnhmjoj approved these changes Oct 19, 2018
View reviewed changes
Copy link
Contributor

@rnhmjoj rnhmjoj left a comment

Choose a reason for hiding this comment

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

I tried it and seems to work.

@samueldr samueldr merged commit 8713c07 into NixOS:release-18.09 Oct 20, 2018
@samueldr samueldr deleted the backport/PR48301 branch February 12, 2019 02:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rnhmjoj rnhmjoj rnhmjoj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@samueldr @rnhmjoj @GrahamcOfBorg