[18.03]: Cherry-pick various fixes from master #38823
Merged
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
The `1822-release` build breaks on Hydra, some days ago the stable `2.2.0` release has been tagged on upstream. It required some new build inputs (zlib, curl, SDL2_mixer, python3) and some minor changes in the cmakeFlags and makeFlags for the build. See https://hydra.nixos.org/build/71818713/log See ticket NixOS#36453 and NixOS#31747 (cherry picked from commit d7894d0)
(cherry picked from commit 00823f0)
(cherry picked from commit fbf29e5)
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/hpx/versions. These checks were done: - built on NixOS - ran `/nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0/bin/hpxrun.py -h` got 0 exit code - ran `/nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0/bin/hpxrun.py --help` got 0 exit code - found 1.1.0 with grep in /nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0 - found 1.1.0 in filename of file in /nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0 - directory tree listing: https://gist.github.com/377d8c673231332bb40acb55fed39e53 (cherry picked from commit e28170c)
- add ncurses: configure links against ncurses and fails otherwise
configure: error: Could not link test program to Python.
https://travis-ci.org/NixOS/nixpkgs/builds/48759067
The given hint (Maybe the main Python library has been installed
in some non-standard library path) is misleading.
The config.log reveals that the failure is due to missing ncurses link option
- with-boost-libdir is need to find Boost::IOStreams/regex/etc.
- expat/cgal are detected in /usr/lib when not specified explicitly
- boost > boost159 is needed to have -lboost_python3 (and -lboost_python)
- set pythonModule = Python;
=> inorder to be used in python.buildEnv { extraLibs = [..]; }
tested on MacOSX and in a linux Docker container with:
> nix-shell -I nixpkgs=. -p python2.pkgs.graph-tool
> nix-shell -I nixpkgs=. -p python3.pkgs.graph-tool
(cherry picked from commit a842f0e)
(cherry picked from commit 83dc28c)
* pygame_sdl2: 6.99.10.1227 -> 2.1.0-6.99.14 * renpy: 6.99.12.4 -> 6.99.14 (cherry picked from commit f83cbf2)
Also disable on Py3k due to syntax errors. (cherry picked from commit 85e3b5b)
GrahamcOfBorg
added
6.topic: python
8.has: clean-up
8.has: package (new)
|
Success on aarch64-linux (full log) Attempted: commandergenius, openshift The following builds were skipped because they don't evaluate on aarch64-linux: hpx, opendylan Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: commandergenius, hpx, opendylan, openshift Partial log (click to expand)
|
|
/cc @vcunat |
vcunat
approved these changes
Apr 12, 2018
vcunat
added a commit
that referenced
this pull request
Apr 12, 2018
|
Thanks! All of them seem good. |
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.
Motivation for this change
ZHF #36453 . Fix various builds on 18.03 by cherry-picking from master, mostly version bumps.