Skip to content

Comments

staging-next: 21.11 iteration 1#144730

Merged
vcunat merged 406 commits intomasterfrom
staging-next
Nov 15, 2021
Merged

staging-next: 21.11 iteration 1#144730
vcunat merged 406 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Nov 5, 2021 •
edited by jonringer
Loading

Another staging-next iteration. Documentation here: https://nixos.org/manual/nixpkgs/stable/#submitting-changes-staging-next-branch

https://hydra.nixos.org/job/nixpkgs/staging-next/unstable#tabs-constituents

Per the release schedule we are still restricted to non-breaking changes to release critical packages, and the plan is to merge in about a week (Nov 12).

Next staging-next: #146259

symphorien and others added 30 commits October 25, 2021 20:52
@symphorien
Merge pull request #142336 from yu-re-ka/feature-polkit-musl
419f794 
polkit: fix musl build
@trofi
espeak-ng: explicitly disable parallel building
ed66694 
Current release lacks dependencies on local espeak-ng:

    cd dictsource && ESPEAK_DATA_PATH=/build/espeak-ng LD_LIBRARY_PATH=../src: \
        ../src/espeak-ng --compile=yue && cd ..
    bash: line 1: ../src/espeak-ng: No such file or directory

Should be fixed in next release: espeak-ng/espeak-ng#1029
Can't apply patch as is as Makefile.am diverged quite a bit since 1.50
release.
@sternenseemann
fluidsynth_1: remove at 1.1.11
45b3120 
* FluidSynth 1.1.11 was kept around as a dependency of some packages
  that hadn't yet adjusted to API breakages. All of these packages now
  use FluidSynth 2.x, so fluidsynth_1 can be removed. It has been broken
  ever since glib was updated to 2.70 and was affected by an unpatched
  CVE.

* Refactor expression a bit, use pname instead of name.

* Add changelog entry in case someone was using this downstream
  (accidentally?).

Fixes #141508.
Fixes #124624.
@github-actions
Merge staging-next into staging
47ad670
@github-actions
Merge staging-next into staging
e5fe4ac
@SuperSandro2000
Merge pull request #142900 from trofi/sequential-espeak-ng
45e2dc6 
espeak-ng: explicitly disable parallel building
@SuperSandro2000
Merge pull request #141918 from sternenseemann/remove-fluidsynth-1
52abab8
@trofi @zakame
perlPackages.X11XCB: pull upstream fix for parallel build (#142642)
16f8f83 
Co-authored-by: Zak B. Elep <[email protected]>
@trofi @SuperSandro2000
perlPackages.libnet: fix Net/libnet.cfg determinism. (#142876)
742101b 
Co-authored-by: Sandro <[email protected]>
@github-actions
Merge staging-next into staging
9d11ed2
@SuperSandro2000
Merge pull request #142777 from trofi/sequential-m17n_lib
4ed40e8
@ivan
ffmpeg_4: 4.4 -> 4.4.1
205b617
@github-actions
Merge staging-next into staging
7455d89
@Artturin
snappy: 1.1.8 -> 1.1.9 + add pkgconfig file
ededca0
@arcz
protobuf: 3.18.1 -> 3.19.0
fc50030
@github-actions
Merge staging-next into staging
b6a580b
@vcunat
Merge #142684: gcc11: 11.1.0 -> 11.2.0 (into staging)
2489900
@github-actions
Merge staging-next into staging
9e0658f
@marsam
Merge pull request #142096 from arcz/protobuf-3.18.1
dbf16dc 
protobuf: 3.18.0 -> 3.19.0
@7c6f434c
Merge pull request #118100 from max-privatevoid/fix/glib-appinfo-watch
ce6b36c 
glib: follow profile updates when searching apps
@figsoda
rustPlatform: add support for features
5a08a28
@figsoda
ncspot: use buildFeatures
007c379
@figsoda
lucky-commit: use checkNoDefaultFeatures
d7d45aa
@figsoda
doc/rust: add documentation for feature options
62d502d
@marsam
Merge pull request #142678 from marsam/update-libvpx
c505be6 
libvpx: 1.10.0 -> 1.11.0
@SuperSandro2000
Merge pull request #142929 from ivan/ffmpeg-4.4.1
1ba98ab
@SuperSandro2000
Merge pull request #140475 from TredwellGit/xorg.libXi
a583a5b
@SuperSandro2000
Merge pull request #141086 from TredwellGit/xorg.xf86inputlibinput
e6e53f6
@felixsinger
kexec-tools: 2.0.20 -> 2.0.22
4711d9e 
Signed-off-by: Felix Singer <[email protected]>
@Ma27 @felixsinger
nixos/kexec: fix test
c9fbe0d
@oxalica oxalica mentioned this pull request Nov 12, 2021
Merged
11 tasks
@nrdxp
Copy link

nrdxp commented Nov 13, 2021

Looks like we are a day behind on this. Anything holding up the merge? I'd like to help get this merged by EOD at least, if possible.

@fabianhjr
Copy link
Member

fabianhjr commented Nov 13, 2021

@nrdxp, not sure if a blocker but the only issue I am aware of is firefox: #144670.

Jon Ringer reported no regressions otherwise.

@fabianhjr
Copy link
Member

fabianhjr commented Nov 13, 2021

Regarding that issue, it seems like there is some approval for a fix: #145459 (3 hours ago) that should ideally be merged into staging-next.

@sternenseemann
Copy link
Member

sternenseemann commented Nov 13, 2021

@nrdxp, not sure if a blocker but the only issue I am aware of is firefox: #144670.

There are other big ones like libreoffice and thunderbird, likely more. As it stands we absolutely can't merge as the unstable jobset doesn't succeed.

Seems like Jon's build report doesn't really hold anymore.

@vcunat
Copy link
Member Author

vcunat commented Nov 13, 2021

Hydra's take on this, though some new failures were apparently temporary and will disappear on restart: https://hydra.nixos.org/eval/1721869?compare=1721771

I noticed the libreoffice regression mentioned a bit above, too. Nothing else stood out to me, though in the comparison there still are over 10k unfinished builds.

@oxalica @sternenseemann
firefox: use rustc.llvmPackages.stdenv with bintools
f857492 
Currently `clangUseLLVM` is broken since it uses libcxx and compiler-rt but
also specifies `--gcc-toolchain`, which leads to weird compile errors when
including C++ headers.
@oxalica @sternenseemann
firefox: add a patch fixing deadlock
2774c72
@jonringer
Copy link
Contributor

jonringer commented Nov 13, 2021

@nrdxp, not sure if a blocker but the only issue I am aware of is firefox: #144670.

There are other big ones like libreoffice and thunderbird, likely more. As it stands we absolutely can't merge as the unstable jobset doesn't succeed.

Seems like Jon's build report doesn't really hold anymore.

It was my third time attempting to review it. if there are flakey builds then it's possible i just got lucky a few times.

github-actions bot and others added 6 commits November 14, 2021 00:01
@github-actions
Merge master into staging-next
9b5a105
@github-actions
Merge master into staging-next
0ca0546
@Mic92
Merge pull request #145589 from oxalica/fix/libreoffice
87c9d75 
[staging-next] libreoffice*: update and fix build
@vcunat
Revert "metrics: drop requiredSystemFeatures; /cc #76776"
30e1b0b 
This reverts commit c7aef6d.

I believe it should work again since today, though I'm being a bit
conservative, pushing to `staging-next` instead of `master`.
@github-actions
Merge master into staging-next
bc35dc4
@sternenseemann
Merge remote-tracking branch 'origin/master' into staging-next
2f78a2d
@sternenseemann

This comment has been minimized.

Sign in to view
@sternenseemann
Copy link
Member

sternenseemann commented Nov 14, 2021

Merged again to include evaluation fix bdaf941 for the issue introduced in 6fe9972 while resolving a conflict in the first merge.

@yu-re-ka
Copy link
Contributor

yu-re-ka commented Nov 14, 2021

Runs on my systems just fine now. Firefox and Thunderbird work as well.

hyperscan, which is optionally used by rspamd, doesn't build.

@vcunat
Copy link
Member Author

vcunat commented Nov 15, 2021

https://hydra.nixos.org/eval/1722344?compare=1722301#tabs-now-fail

We're certainly not perfect, but to me this PR seems OK for master.

@vcunat vcunat merged commit 64065d7 into master Nov 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@bobby285271 bobby285271 bobby285271 left review comments

@andir andir Awaiting requested review from andir

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

@LnL7 LnL7 Awaiting requested review from LnL7

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92

@stigtsp stigtsp Awaiting requested review from stigtsp

@ttuegel ttuegel Awaiting requested review from ttuegel

@zakame zakame Awaiting requested review from zakame

@zowoq zowoq Awaiting requested review from zowoq

+1 more reviewer

@jonringer jonringer jonringer approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: kernel The Linux kernel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 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.