Skip to content

Staging next 2022-01-29#157215

Merged
vcunat merged 66 commits intomasterfrom
staging-next
Feb 2, 2022
Merged

Staging next 2022-01-29#157215
vcunat merged 66 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Jan 29, 2022 •
edited
Loading

This iteration is a bit special. As there's a screen-locking mass rebuild regression (#157112), I picked fix for that and security fixes from staging except cases that would have lots of darwin rebuilds (which is more loaded now; expat + rust). The intention is that this way we might be able to merge significantly quicker than usually while still getting the most urgent changes. (EDIT: that includes avoiding more risky changes.)

workflow docs: https://nixos.org/manual/nixpkgs/unstable/#submitting-changes-commit-policy
constitutents: https://hydra.nixos.org/job/nixpkgs/staging-next/unstable#tabs-constituents
jobset: https://hydra.nixos.org/jobset/nixpkgs/staging-next

Previous staging-next: #154708

github-actions bot and others added 21 commits January 26, 2022 00:01
@github-actions
Merge master into staging-next
8742711
@github-actions
Merge master into staging-next
849510d
@github-actions
Merge master into staging-next
934efba
@github-actions
Merge master into staging-next
f5a42fa
@github-actions
Merge master into staging-next
edd0d17
@veprbl
Merge branch 'master' into staging-next
b32ed60
@github-actions
Merge master into staging-next
6c44d52
@github-actions
Merge master into staging-next
aae14e6
@github-actions
Merge master into staging-next
67f4263
@github-actions
Merge master into staging-next
4326aca
@github-actions
Merge master into staging-next
c256c45
@github-actions
Merge master into staging-next
77152c8
@vcunat
gnutls: 3.7.2 -> 3.7.3
67fc40a 
Includes a low-severity security fix.
https://lists.gnupg.org/pipermail/gnutls-help/2022-January/004736.html
@vcunat
gnutls: fix IDN support
a10d11b 
- recent versions only accept libidn2 (not libidn)
- it's for free, as it's a runtime dependency of glibc anyway
@vcunat
linux-pam: make it use SUID wrapped version of unix_ckpwd
fd8f6de
@github-actions
Merge master into staging-next
0c0f31b
@vcunat
Merge #156541: util-linux: 2.37.2 -> 2.37.3 (into staging)
d7a004f 
Two CVEs get fixed, no other changes:
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.3-ReleaseNotes

(cherry picked from commit b04e17c)
@SuperSandro2000 @vcunat
Merge #154825: python3Packages.{pillow,imageio}: security updates
76b70d0 
(cherry picked from commit d6374a3)
@Ma27 @vcunat
Merge #154984: glibc: 2.33-62 -> 2.33-71
96b2dec 
(cherry picked from commit ae543ed)
@Ma27 @vcunat
Merge #156684: glibc: 2.33-71 -> 2.33-78 (security)
7305e48 
(cherry picked from commit ab6773a)
@Ma27 @vcunat
Merge #157114: glibc: 2.33-78 -> 2.33-108
512ba72 
(cherry picked from commit 3ecbb12)
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jan 29, 2022
@ofborg ofborg bot added the 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. label Jan 29, 2022
@github-actions github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 31, 2022
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jan 31, 2022
@mohe2015 mohe2015 mentioned this pull request Feb 1, 2022
Closed
@collares collares mentioned this pull request Feb 1, 2022
Merged
13 tasks
@fabianhjr
Copy link
Member

fabianhjr commented Feb 1, 2022

due to gdm.nvidiaWayland removal on this PR a usage removal is required:

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index ff4225dc29a..7387f810f01 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -179,7 +179,7 @@ in
   in mkIf enabled {
     assertions = [
       {
-        assertion = with config.services.xserver.displayManager; (gdm.enable && gdm.nvidiaWayland) -> cfg.modesetting.enable;
+        assertion = with config.services.xserver.displayManager; gdm.enable -> cfg.modesetting.enable;
         message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`";
       }

@bachp
Copy link
Member

bachp commented Feb 1, 2022 •
edited
Loading

Should we also pick #157709 ? It contains 3 important CVE fixes. One of them has a base score of 9.9 and allows remote code execution as root.

Already on master via #157729

github-actions bot and others added 2 commits February 1, 2022 18:01
@github-actions
Merge master into staging-next
f5bdd2b
@jtojnar
nixos/nvidia: remove obsolete GDM on Wayland assertion
e00317b 
GDM enables Wayland on supported platforms automatically (see ${gnome.gdm}/lib/udev/rules.d/61-gdm.rules), so we removed the `gdm.nvidiaWayland` option.

You will still need `hardware.nvidia.modesetting.enable = true;` with `nvidia` driver, though.
@jtojnar
Copy link
Member

jtojnar commented Feb 1, 2022

Thanks removed the assertion altogether in e00317b.

@fabianhjr
Copy link
Member

fabianhjr commented Feb 1, 2022

Built and booted into staging-next. Thanks for the patch @jtojnar! UwU

@vcunat vcunat merged commit f85152d into master Feb 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@Ma27 Ma27 Awaiting requested review from Ma27

@primeos primeos Awaiting requested review from primeos

@cillianderoiste cillianderoiste Awaiting requested review from cillianderoiste

@prikhi prikhi Awaiting requested review from prikhi

@edolstra edolstra Awaiting requested review from edolstra

@fpletz fpletz Awaiting requested review from fpletz

@hedning hedning Awaiting requested review from hedning

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees

No one assigned

Labels

6.topic: GNOME GNOME desktop environment and its underlying platform 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. 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: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 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

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@vcunat @fabianhjr @bachp @jtojnar @cole-h @veprbl @SuperSandro2000 @Ma27 @primeos