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

Jump to bottom

Staging next #87814

Merged
merged 287 commits into from May 29, 2020
Merged

Staging next #87814

merged 287 commits into from May 29, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented May 14, 2020

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

FRidh added 30 commits May 11, 2020 22:12
@FRidh
pythonPackages.requests: 2.22.0 -> 2.23.0
f14d4b4
@FRidh
python: mock: 3.0.5 -> 4.0.2
b45c501
@FRidh
python3Packages.GitPython: 3.1.0 -> 3.1.2
36c9856
@FRidh
python3Packages.JPype1: 0.7.1 -> 0.7.4
e71abc1
@FRidh
python3Packages.Mako: 1.1.1 -> 1.1.2
9586dae
@FRidh
python3Packages.Nikola: 8.0.3 -> 8.0.4
c578c7a
@FRidh
python3Packages.adal: 1.2.2 -> 1.2.3
4fda162
@FRidh
python3Packages.alembic: 1.3.2 -> 1.3.3
5d80f31
@FRidh
python3Packages.alerta-server: 7.4.1 -> 7.4.6
7beb4a4
@FRidh
python3Packages.alerta: 7.4.0 -> 7.4.5
b3f06a0
@FRidh
python3Packages.ansible-runner: 1.4.4 -> 1.4.6
6e2196d
@FRidh
python3Packages.apprise: 0.8.4 -> 0.8.5
c5b7474
@FRidh
python3Packages.arrow: 0.15.5 -> 0.15.6
186250b
@FRidh
python3Packages.atlassian-python-api: 1.15.6 -> 1.15.7
511e621
@FRidh
python3Packages.auth0-python: 3.9.1 -> 3.9.2
6ce1173
@FRidh
python3Packages.authheaders: 0.12.1 -> 0.12.2
84bbf2c
@FRidh
python3Packages.autobahn: 19.11.1 -> 19.11.2
789f42c
@FRidh
python3Packages.avro-python3: 1.9.1 -> 1.9.2.1
fdd49e1
@FRidh
python3Packages.avro: 1.9.1 -> 1.9.2
2defc69
@FRidh
python3Packages.awkward: 0.12.20 -> 0.12.21
701026f
@FRidh
python3Packages.awkward1: 0.2.12 -> 0.2.19
9257ecd
@FRidh
python3Packages.bleach: 3.1.0 -> 3.1.5
f2fd4a4
@FRidh
python3Packages.boto3: 1.11.13 -> 1.11.17
d3328ee
@FRidh
python3Packages.botocore: 1.14.13 -> 1.14.17
f18bd6a
@FRidh
python3Packages.Bottleneck: 1.3.1 -> 1.3.2
2c5bcb0
@FRidh
python3Packages.catalogue: 0.2.0 -> 0.2.1
3a04f66
@FRidh
python3Packages.cfn-lint: 0.26.2 -> 0.26.3
0de9714
@FRidh
python3Packages.chalice: 1.13.0 -> 1.13.1
cff29cc
@FRidh
python3Packages.python-cjson: 1.2.1 -> 1.2.2
3430afd
@FRidh
python3Packages.click: 7.1.1 -> 7.1.2
3d39658
@FRidh
Copy link
Member Author

FRidh commented May 14, 2020

Do we have binutils 2.34 again on staging(-next)? Did something go wrong with merges? cc @flokli @Ericson2314 @vcunat

@flokli
Copy link
Contributor

flokli commented May 14, 2020 •
edited

@FRidh staging has #85951 #86954, which is a second attempt that shouldn't break things anymore.

@jonringer jonringer mentioned this pull request May 15, 2020
Closed
10 tasks
@FRidh
Copy link
Member Author

FRidh commented May 17, 2020

Python's cffi fails #86954 (comment)

jtojnar and others added 5 commits May 18, 2020 21:09
@jtojnar
Merge branch 'master' into staging-next
7f40cfd
@vcunat
unbound: 1.10.0 -> 1.10.1 (security)
73390e3 
https://www.nlnetlabs.nl/news/2020/May/19/unbound-1.10.1-released/
It fixes DoS CVEs; details e.g. on http://www.nxnsattack.com/

On each Linux platform this should be around 8k rebuilds,
so as a compromise I'm pushing to staging-next.
@FRidh
Revert "Merge pull request #86954 from lovesegfault/binutils-2.34"
24c96b9 
Pythons find_library is broken with binutils 2.34, and numpy could not import libraries because of not properly aligned ELF's.

This is the second time binutils 2.34 got reverted. Next time, we should have a dedicated Hydra job for it.

This reverts commit 629fa8a, reversing
changes made to 4ddd080.
@FRidh
Revert "Revert "Revert "libbfd: fix build"""
5c2b59d 
Reverting this change again because we're going back to binutils 2.31.

#86954 (comment)

This reverts commit ade7fae.
@FRidh
Merge master into staging-next
b345513
@flokli
Copy link
Contributor

flokli commented May 25, 2020

It seems now python3.pkgs.cython (used by gtk-doc) fails. Might have been broken by 1ac5398 (cc @Ericson2314), or by a broken revert of #86954:

❯ nix-build -A python3.pkgs.cython
these derivations will be built:
  /nix/store/7kq52z55dhp44irxcz1j58yvv2x2k13r-python3.7-Cython-0.29.14.drv
building '/nix/store/7kq52z55dhp44irxcz1j58yvv2x2k13r-python3.7-Cython-0.29.14.drv'...
bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
Sourcing python-remove-tests-dir-hook
Sourcing python-catch-conflicts-hook.sh
Sourcing python-remove-bin-bytecode-hook.sh
Sourcing setuptools-build-hook
Using setuptoolsBuildPhase
Using setuptoolsShellHook
Sourcing pip-install-hook
Using pipInstallPhase
Sourcing python-imports-check-hook.sh
Using pythonImportsCheckPhase
Sourcing python-namespaces-hook
/nix/store/8cz3waxwnvqd1mxw3aniiwimr8kvxbsg-python3.7-pkgconfig-1.5.1/nix-support/setup-hook: line 61: export: `NIX_@wrapperName@_TARGET_HOST_@suffixSalt@=1': not a valid identifier
builder for '/nix/store/7kq52z55dhp44irxcz1j58yvv2x2k13r-python3.7-Cython-0.29.14.drv' failed with exit code 1
error: build of '/nix/store/7kq52z55dhp44irxcz1j58yvv2x2k13r-python3.7-Cython-0.29.14.drv' failed

@vcunat
Copy link
Member

vcunat commented May 25, 2020 •
edited

My "dumb" bisection showed

There are only 'skip'ped commits left to test.
The first bad commit could be any of:
26f635d
42b2035
c71ab32
f29919d
4b2ab66
We cannot bisect more!

and all of that are his commits around pkgconf(ig), so I'd hope he might know easily what got wrong in particular.

@vcunat
Copy link
Member

vcunat commented May 25, 2020

Still, note that the error is not present in this PR, i.e. it's ATM in staging-next..staging.

@flokli flokli mentioned this pull request May 25, 2020
Merged
14 tasks
@vcunat vcunat mentioned this pull request May 29, 2020
Closed
@FRidh FRidh merged commit b27a19d into master May 29, 2020
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 jonringer is a code owner

@LnL7 LnL7 Awaiting requested review from LnL7

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

Assignees
No one assigned
Labels
1.severity: security 6.topic: python 6.topic: rust 8.has: clean-up 8.has: documentation 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@FRidh @flokli @vcunat @jonringer @prusnak @peterhoeg @cole-h @matthewbauer @Ericson2314 @jtojnar