Skip to content

Staging next 2022-02-03#158080

Merged
jonringer merged 879 commits intomasterfrom
staging-next
Feb 10, 2022
Merged

Staging next 2022-02-03#158080
jonringer merged 879 commits intomasterfrom
staging-next

Conversation

@jonringer
Copy link
Contributor

@jonringer jonringer commented Feb 4, 2022 •
edited by vcunat
Loading

Major changes:

  • Mass python pkgs update
  • llvm bump for linux: 7 -> 11
  • ffmpeg default bumped to 5.x

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: #157215

mweinelt and others added 30 commits January 25, 2022 11:26
@mweinelt
Merge pull request #156607 from risicle/ris-expat-CVE-2022-23852
f0c2087
@r-ryantm
catch2: 2.13.7 -> 2.13.8
1593060 
(#154407)
@github-actions
Merge staging-next into staging
077faa4
@Ma27
Merge pull request #156684 from vcunat/p/glibc-patches
ab6773a 
glibc: 2.33-71 -> 2.33-78 (security)
@mweinelt
gixy: pin pyparsing at 2.4.7
19ec45f
@vs49688
ffmpeg: switch to ffmpeg_5
9236978 
* Keep opencv{2,3,4} on ffmpeg_4 as upstream hasn't updated yet.
  See [1].
* Remove libavresample from ffmpeg-full, as it was removed in 5.0.

[1]: opencv/opencv#21455
@vs49688
ffmpeg-full: add libxml2 dependency
64efca5 
For the DASH and IMF demuxers.
@mweinelt
Merge pull request #156702 from mweinelt/gixy
50d8173
@r-ryantm
tdb: 1.4.5 -> 1.4.6
7790930
@bachp
Merge pull request #156748 from r-ryantm/auto-update/tdb
5127ae5 
tdb: 1.4.5 -> 1.4.6
@jtojnar
Merge pull request #154096 from zhaofengli/tracker-gi-buildinput
b2f8a5e 
tracker: Unconditionally add checkInputs to nativeBuildInputs
electrum-ltc: unbreak
354fdf8
electrum: unbreak
aa40507
@lovesegfault
Merge pull request #156539 from alyssais/cryptsetup-debug
83590b1 
cryptsetup: enable debug info
@SuperSandro2000
python39Packages.setuptools-scm: 6.3.2 -> 6.4.2
982158e
@primeos
Merge pull request #156610 from primeos/git
bf4e2bf 
git: 2.34.1 -> 2.35.0
@SuperSandro2000
mime-types: drop, gentoo replaced it with mailcap, marked for removal
e0c9844
@SuperSandro2000
nyxt: mime-types -> mailcap
4545189
@SuperSandro2000
cpython: mime-types -> mailcap
be1fef9
@SuperSandro2000
python39Packages.mat2: mime-types -> mailcap
6d8df00
@SuperSandro2000
gmnisrv: mime-types -> mailcap
ac2f732
@SuperSandro2000
nixos/ceph: mime-types -> mailcap
b20ad47
@veprbl
Merge branch 'staging-next' into staging
0693fd7 
 Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
	nixos/doc/manual/release-notes/rl-2205.section.md
	pkgs/development/python-modules/aioesphomeapi/default.nix
	pkgs/development/python-modules/mat2/default.nix
	pkgs/development/python-modules/pydevccu/default.nix
	pkgs/development/python-modules/pywlroots/default.nix
	pkgs/development/python-modules/rokuecp/default.nix
@trofi
re2c: 2.2 -> 3.0
e532d59 
https://re2c.org/releases/changelog/changelog.html

While at it added trivial updater script.
@SuperSandro2000
Merge pull request #153478 from vlaci/lziprecover
cdb20df
@r-ryantm
zstd: 1.5.1 -> 1.5.2
b7c57ee
@r-ryantm
rdma-core: 38.1 -> 39.0
22894ee
@TredwellGit
glibc: 2.33-78 -> 2.33-108
00caaf1
@jtojnar
Merge branch 'staging-next' into staging
2da5ce4 
; Conflicts:
;	pkgs/development/python-modules/fakeredis/default.nix
@jtojnar
Merge pull request #155553 from r-ryantm/auto-update/networkmanager
e7c8978 
networkmanager: 1.32.12 -> 1.34.0
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 10, 2022
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 10, 2022
@Synthetica9 Synthetica9 mentioned this pull request Feb 10, 2022
Closed
13 tasks
@Synthetica9
Copy link
Member

Synthetica9 commented Feb 10, 2022

I'm not sure if this is warranted, but I'd really like #157631 to get in master ASAP. A lot of people's sound is broken atm. Is there some way I could speed that up (just merge it directly into master as well?)

I think we could cherry-pick it to staging-next. We seem to have a lot of non-big-parallel capacity for x86_64-linux

Okay, see #158949

@zowoq
Copy link
Contributor

zowoq commented Feb 10, 2022

I think we could cherry-pick it to staging-next.

I think may have meant to cherry pick it from staging to staging-next, not staging-next to master.

@Synthetica9
Copy link
Member

Synthetica9 commented Feb 10, 2022

I think we could cherry-pick it to staging-next.

I think may have meant to cherry pick it from staging to staging-next, not staging-next to master.

Oh I assumed he meant from staging-next since it's already in staging-next

@vcunat
Copy link
Member

vcunat commented Feb 10, 2022

@fabianhjr: fish resolved without updating.

fabianhjr
fabianhjr approved these changes Feb 10, 2022
View reviewed changes
Copy link
Member

@fabianhjr fabianhjr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds and boots in my config, haven't noticed any issues.

@jonringer
Copy link
Contributor Author

jonringer commented Feb 10, 2022

Oh I assumed he meant from staging-next since it's already in staging-next

oh, I assumed it was in staging, given the urgency

@jonringer
Copy link
Contributor Author

jonringer commented Feb 10, 2022

Newly succeeding is about even with newly failing:
https://hydra.nixos.org/eval/1743207?filter=x86_64-linux&compare=1743148&full=#tabs-now-fail

I'm going to consider this acceptable; as I already spent three nights getting the major regressions.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 10, 2022
@vcunat
Copy link
Member

vcunat commented Feb 10, 2022

Overall I saw quite a lot "regressions" that seemed like they will disappear on restarting the build. And then various python-related regressions...

@zowoq
Copy link
Contributor

zowoq commented Feb 10, 2022

The tomlkit bump looks like it broke remarshal which is used by pkgs.formats.{toml,yaml} so there is probably a few broken modules and tests.

PR: #159074

@vcunat
Copy link
Member

vcunat commented Feb 11, 2022 •
edited
Loading

In trunk-combined the numbers aren't even, as many nixos.tests.** joined the regressions, but it's still probably not too bad. https://hydra.nixos.org/eval/1743296?compare=1743083

EDIT: ah, maybe the merged remashal fix already changed that, but we don't have an evaluation yet.

@vcunat vcunat mentioned this pull request Feb 22, 2022
Merged
@flokli flokli mentioned this pull request Feb 28, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fabianhjr fabianhjr fabianhjr approved these changes

@alyssais alyssais Awaiting requested review from alyssais

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

@LnL7 LnL7 Awaiting requested review from LnL7

@marsam marsam Awaiting requested review from marsam

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92

@ttuegel ttuegel Awaiting requested review from ttuegel

@zowoq zowoq Awaiting requested review from zowoq

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 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: stdenv Standard environment 6.topic: vim Advanced text editor 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 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+ 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 and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.