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 2022-09-15 #191339

Merged
merged 931 commits into from
Sep 29, 2022
Merged

staging-next 2022-09-15 #191339

merged 931 commits into from
Sep 29, 2022

Conversation

@vcunat
Copy link
Member Author

vcunat commented Sep 15, 2022

@vcunat

This comment was marked as outdated.

Breaks tests for Celery.

This reverts commit e21f3ea.
@vcunat vcunat merged commit 8ba1204 into master Sep 29, 2022
@anthonyroussel anthonyroussel mentioned this pull request Sep 30, 2022
13 tasks
@vcunat
Copy link
Member Author

vcunat commented Oct 1, 2022

pkgsi686Linux.python3Packages.bcrypt segfaults during tests and consequently blocks many NixOS tests from running. I can reproduce that locally, but i686 tests don't seem very important.

@mweinelt
Copy link
Member

mweinelt commented Oct 1, 2022

pyca/bcrypt#407

jerith666 added a commit to jerith666/nixpkgs that referenced this pull request Nov 2, 2022
this was originally replaced with temurin in c742218, which landed
in staging in acf46b0 (NixOS#140364)

but it was also added in b6cb656 (in support of openjdk 18 in
da40a44), which landed directly on master in 9413ebb
(NixOS#165354).

those two conflicted when master was merged into staging-next in
a5dfac8 (NixOS#191339), and adoptopenjdk
17 was mistakenly kept during the conflict resolution.

the net result is that one would get:

$ nix-build -A pkgs.adoptopenjdk-hotspot-bin-17
error: Alias adoptopenjdk-hotspot-bin-17 is still in all-packages.nix

... instead of the desired:

$ nix-build -A pkgs.adoptopenjdk-hotspot-bin-17
error: AdoptOpenJDK is now Temurin. Use temurin-bin-17
@jerith666 jerith666 mentioned this pull request Nov 2, 2022
13 tasks
@ghost ghost mentioned this pull request Nov 7, 2022
13 tasks
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