Skip to content

staging-next: another iteration#56200

Merged
FRidh merged 596 commits intomasterfrom
staging-next
Mar 1, 2019
Merged

staging-next: another iteration#56200
FRidh merged 596 commits intomasterfrom
staging-next

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.

FRidh added 30 commits February 17, 2019 14:40
@FRidh
python: thespian: 3.9.5 -> 3.9.7
71007a1
@FRidh
python: tifffile: 0.15.1 -> 2019.2.10
f96cc43
@FRidh
python: tox: 3.5.3 -> 3.7.0
122bc4f
@FRidh
python: tqdm: 4.28.1 -> 4.31.1
8f0e605
@FRidh
python: traits: 4.6.0 -> 5.0.0
4e894eb
@FRidh
python: trezor_agent: 0.9.3 -> 0.10.0
04af0f5
@FRidh
python: trio: 0.10.0 -> 0.11.0
693f27f
@FRidh
python: trustme: 0.4.0 -> 0.5.0
5aa33eb
@FRidh
python: twine: 1.12.1 -> 1.13.0
61df2c1
@FRidh
python: twitter.common.collections: 0.3.9 -> 0.3.10
be9cf3e
@FRidh
python: twitter.common.confluence: 0.3.9 -> 0.3.10
a5e0907
@FRidh
python: twitter.common.dirutil: 0.3.9 -> 0.3.10
ef7a453
@FRidh
python: twitter.common.lang: 0.3.9 -> 0.3.10
bef8cb8
@FRidh
python: twitter.common.log: 0.3.9 -> 0.3.10
7d0aacb
@FRidh
python: twitter.common.options: 0.3.9 -> 0.3.10
1b541e6
@FRidh
python: txtorcon: 18.3.0 -> 19.0.0
2b4ecac
@FRidh
python: typed-ast: 1.1.2 -> 1.3.1
563a1c5
@FRidh
python: uproot-methods: 0.2.11 -> 0.4.2
97169aa
@FRidh
python: uproot: 3.2.15 -> 3.4.5
5a2da81
@FRidh
python: vega_datasets: 0.5.0 -> 0.7.0
aca72e7
@FRidh
python: venusian: 1.1.0 -> 1.2.0
ff48fd0
@FRidh
python: vidstab: 1.0.1 -> 1.5.6
a7413f0
@FRidh
python: virtualenv-clone: 0.2.6 -> 0.5.1
663ac63
@FRidh
python: virtualenv: 16.1.0 -> 16.4.0
1def91f
@FRidh
python: virtualenvwrapper: 4.8.2 -> 4.8.4
a743180
@FRidh
python: voluptuous-serialize: 2.0.0 -> 2.1.0
a69a3e8
@FRidh
python: waitress: 1.1.0 -> 1.2.1
00a9e6c
@FRidh
python: wheel: 0.32.3 -> 0.33.0
10baae2
@FRidh
python: wrapt: 1.10.11 -> 1.11.1
79dc679
@FRidh
python: wsproto: 0.12.0 -> 0.13.0
7382057
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 24, 2019
@dotlambda dotlambda mentioned this pull request Feb 24, 2019
Merged
10 tasks
dotlambda
dotlambda reviewed Feb 25, 2019
View reviewed changes
pkgs/development/python-modules/fiona/default.nix
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";

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

@dotlambda dotlambda Feb 25, 2019

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

@FRidh FRidh Feb 25, 2019

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.

@GrahamcOfBorg GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 25, 2019
@FRidh
Copy link
Member

FRidh commented Feb 25, 2019

Python failure of jupyter/nbconvert is transient.

@lheckemann
Copy link
Member

lheckemann commented Feb 25, 2019

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.

@alyssais @vcunat
openssl: 1.0.2q -> 1.0.2r
fc4a8f6 
(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.
This was referenced Feb 27, 2019
Merged
Closed
@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

Reviewers

@dotlambda dotlambda dotlambda left review comments

+1 more reviewer

@FRidh FRidh FRidh left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: stdenv Standard environment 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

19.03

Development

Successfully merging this pull request may close these issues.