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

Staging next #71780

Merged
merged 484 commits into from
Oct 24, 2019
Merged

Staging next #71780

merged 484 commits into from
Oct 24, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Oct 23, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @

FRidh and others added 30 commits October 18, 2019 09:54
@FRidh
python: pyzmq: 18.0.2 -> 18.1.0
fe0e2b2
@FRidh
pythonPackages.ipykernel: 5.1.1 -> 5.1.2
6b4902a
@FRidh
pythonPackages.hypothesis: fixup
caf70f4
@FRidh
pythonPackages.jupyter_core: fixup
949fd1f
@FRidh
pythonPackages.pytest-relaxed: fix build
46f7f9c
@FRidh
pythonPackages.docker: 4.0.2 -> 4.1.0
e995f04
@FRidh
python: commonmark: 0.8.1 -> 0.9.1
16c01cc
@FRidh
pythonPackages.importlib-meta: 0.18 -> 0.23
7eed62d
@FRidh
pythonPackages.pyjwt: fix tests
5cc8fdb
@FRidh
pythonPackages.tables: freeze at 3.5.2
14f78c3
@FRidh
python37Packages.tables: 3.5.2 -> 3.6.0
3611942
@FRidh
pythonPackages.networkx: freeze at 2.2
fa3287e
@FRidh
python3Packages.networkx: 2.2 -> 2.4
5725366
@FRidh
pythonPackages.multidict: disable tests for 3.8
8a37580
@FRidh
pythonPackages.arpeggio: fix build
a6604df
@FRidh
python: astroid: 2.2.5 -> 2.3.1
5738b54
@FRidh
python: lazy-object-proxy: 1.3.1 -> 1.4.2
a23e098
@FRidh
pythonPackages.lazy-object-proxy: fixup build
5533eaa
@FRidh
ansible: drop boto dependency
4af94d0 
Does not seem to be needed. Hasn't been updated in over a year either.
@FRidh
python: Pillow: 5.4.1 -> 6.2.0
b4ef5c4
@FRidh
python: pylint: 2.3.1 -> 2.4.2
fd5e7da
@FRidh
python: text-unidecode: 1.2 -> 1.3
c8b017c
@FRidh
pythonPackages.joblib: 0.13.2 -> 0.14.0
76c2bde
@FRidh
pythonPackages.approvaltests: 0.2.4 -> 0.2.6
95b8b57
@FRidh
pythonPackages.dbus-python: 1.2.4 -> 1.2.12
21e178a
@FRidh
awscli: 1.16.215 -> 1.16.261
b5623ef
@FRidh
python: botocore: 1.12.250 -> 1.12.251
dcdcb66
@FRidh
awscli and aws_shell: use the same python version with deps
365098e 
We need this python version with its custom dependencies for aws_shell.
@FRidh
python3Packages.pybind11: 2.3.0 -> 2.4.3
8ae6fb0
@FRidh
python3Packages.numpydoc: 0.8.0 -> 0.9.1
762be1c
@FRidh FRidh requested a review from jonringer as a code owner October 23, 2019 07:40
@ofborg ofborg bot added 6.topic: golang 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux-stdenv This PR causes stdenv to rebuild 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Oct 23, 2019
@FRidh
Copy link
Member Author

FRidh commented Oct 23, 2019

pkgsi686Linux.openssl_1_0_2 regression #71786.

@dtzWill
Copy link
Member

dtzWill commented Oct 23, 2019

Forgive the offtopic comment, but just wanted to say 👍 THANK YOU @FRidh for your constant work tackling these staging->staging-next->master monsters (well, sometimes monsters)! That's all! Your efforts are appreciated! ❤️

FRidh added 2 commits October 23, 2019 12:48
@FRidh
python.pkgs.twisted: move twisted cache generation to postFixup
e70c017 
The Python 2 build of twisted would fail when generating the cache. This
failure started occuring since the change was introduced that builds
setuptools as a wheel instead of as an egg,
90be4c2.

Turns out moving this step to postFixup solves the issue. I suppose it
is related to the order of site packages being evaluated, where
PYTHONPATH introduced additional ones.
@FRidh
Revert "pythonPackages.twisted: disable python2"
767c0b7 
Builds fine now.

This reverts commit a1a8c96.
@FRidh
Copy link
Member Author

FRidh commented Oct 23, 2019

Thanks @dtzWill ! If you keep pushing those core package updates, then I'll handle these monsters ;-)

@FRidh
openssl: use old method for configuring on i686, fixes #71786
af491cb 
unbreaks pkgsi686Linux.openssl_1_0_2
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 23, 2019
@FRidh
Copy link
Member Author

FRidh commented Oct 23, 2019

Linux builds look good and are ready to go. Will wait till tomorrow for Darwin to catch up.
https://hydra.nixos.org/eval/1550390

@jonringer
Copy link
Contributor

oops, looks like I accidentally merged a conflict

@jonringer
Copy link
Contributor

scared to push the merge conflict change, don't want to kick off another hydra job

@FRidh
Copy link
Member Author

FRidh commented Oct 23, 2019

This hydra jobset evaluates only every 12 hours.

Tomorrow morning when more Darwin builds are finished I will solve the merge conflicts and merge it into master.

@FRidh FRidh merged commit fa21e8c into master Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: golang 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 8.has: changelog 8.has: clean-up 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+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv This PR causes stdenv to rebuild
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.