Skip to content

staging-next 2022-09-15 #191339

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
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

@vcunat vcunat commented Sep 15, 2022 •
edited
Loading

@github-actions github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: vim Advanced text editor 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 15, 2022
@vcunat
Copy link
Member Author

vcunat commented Sep 15, 2022 •
edited
Loading

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux. 8.has: clean-up This PR removes packages or removes other cruft 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-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Sep 15, 2022
vcunat and others added 13 commits September 28, 2022 17:48
@vcunat
rtrlib: fix paths in .pc file
9e8bf24
@vcunat
the-foundation: fixup paths in .pc file
ad0a72f
@vcunat
libsurvive: fixup paths in more .pc files
9db13aa
@vcunat
miniz: fixup paths in .pc file
7e40546
@mweinelt
python3Packages.grpcio-tools: relax protobuf constraint
ccce3fc
@vcunat
Revert "rnp: fix path in pkg-config file"
07de498 
This reverts commit d5f218a.
The patch was included, probably since update in commit 74f8cdc.
@vcunat
osl: fixup paths in .pc files
c45e994
@vcunat
python3Packages.qscintilla: add setuptools
dbe8045
@vcunat
valhalla: fixup paths in .pc file
5b8ead5
@mweinelt
protobuf3_19: 3.19.4 -> 3.19.5
c9b98fe 
GHSA-8gq9-2x98-w8hf

Fixes: CVE-2022-1941
@mweinelt
protobuf3_20: 3.20.1 -> 3.20.2
b399dde 
GHSA-8gq9-2x98-w8hf

Fixes: CVE-2022-1941
@mweinelt
protobuf3_21: 3.21.2 -> 3.21.6
d9550c1 
GHSA-8gq9-2x98-w8hf

Fixes: CVE-2022-1941
@mweinelt
protobuf3_11: remove
9b5f227 
No consumers and does not receive updates anymore and therefore probably
vulnerable to CVE-2022-1941 and others.
@vcunat

This comment was marked as outdated.

Sign in to view
@RaitoBezarius RaitoBezarius mentioned this pull request Sep 28, 2022
Merged
13 tasks
@K900
Revert "python3Packages.billiard: 4.0.0 -> 4.0.2"
5a18fc7 
Breaks tests for Celery.

This reverts commit e21f3ea.
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 29, 2022
@vcunat vcunat merged commit 8ba1204 into master Sep 29, 2022
@vcunat vcunat mentioned this pull request Sep 29, 2022
Merged
@anthonyroussel anthonyroussel mentioned this pull request Sep 30, 2022
Merged
13 tasks
@vcunat
Copy link
Member Author

vcunat commented Oct 1, 2022 •
edited
Loading

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
@jerith666
adoptopenjdk 17: remove (again)
dca850e 
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
Merged
13 tasks
@ghost ghost mentioned this pull request Nov 7, 2022
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar Awaiting requested review from jtojnar

@kalbasit kalbasit Awaiting requested review from kalbasit

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

@jonringer jonringer Awaiting requested review from jonringer

@teto teto Awaiting requested review from teto

@ttuegel ttuegel Awaiting requested review from ttuegel

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@marsam marsam Awaiting requested review from marsam

@FRidh FRidh Awaiting requested review from FRidh

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@mweinelt mweinelt Awaiting requested review from mweinelt

@LnL7 LnL7 Awaiting requested review from LnL7

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: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim Advanced text editor 8.has: clean-up This PR removes packages or removes other cruft 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.