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

staging-next: another iteration #56200

Merged
merged 596 commits into from Mar 1, 2019
Merged

staging-next: another iteration #56200

merged 596 commits into from Mar 1, 2019

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented Feb 22, 2019

This might be the last iteration before forking 19.03, so let me /cc @lheckemann.

@dotlambda dotlambda mentioned this pull request Feb 24, 2019
10 tasks
@@ -14,24 +15,35 @@ buildPythonPackage rec {

CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";

nativeBuildInputs = [
gdal # for gdal-config
Copy link
Member

Choose a reason for hiding this comment

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

@FRidh Just wanted to let you know that I believe this is a situation where a package needs to be in nativeBuildInputs as well as buildInputs.

Copy link
Member

Choose a reason for hiding this comment

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

Probably yes. gdal-config requires it to be in nativeBuildInputs, but we also build against it so also in buildInputs.

@FRidh
Copy link
Member

FRidh commented Feb 25, 2019

Python failure of jupyter/nbconvert is transient.

@lheckemann
Copy link
Member

This won't magically be ready in the next hour, will it? :/ I guess we'll have to rebase it into the release branch after the fact. :(

@FRidh
Copy link
Member

FRidh commented Feb 25, 2019

I think this can go in. Aarch64 is currently broken, but that can be fixed up.

(cherry picked from commit 9c94d74)
From PR #56414.  Forward-picking from staging to staging-next,
as minor openssl bumps tend to be fairly breakage-free.
@FRidh
Copy link
Member

FRidh commented Feb 27, 2019

@vcunat @lheckemann how to proceed to get this into staging-19.03?

@FRidh FRidh merged commit fc4a8f6 into master Mar 1, 2019
@FRidh
Copy link
Member

FRidh commented Mar 1, 2019

I've merged staging-next into both master and staging-19.03.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet