Skip to content

systemd: 246.6 -> 247#102355

Merged
Mic92 merged 1 commit intoNixOS:stagingfrom
Mic92:systemd
Dec 3, 2020
Merged

systemd: 246.6 -> 247#102355
Mic92 merged 1 commit intoNixOS:stagingfrom
Mic92:systemd

Conversation

@Mic92
Copy link
Copy Markdown
Member

@Mic92 Mic92 commented Nov 1, 2020 •
edited
Loading

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 1, 2020

@flokli @arianvp feel free to push on top. Build is fixed but I have not booted from it yet.

@ofborg ofborg bot requested review from andir, edolstra and flokli November 1, 2020 15:53
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 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. labels Nov 1, 2020
@davidak davidak mentioned this pull request Nov 1, 2020
Closed
@Mic92 Mic92 changed the title systemd: 246.6 -> 247-rc1 systemd: 246.6 -> 247-rc2 Nov 14, 2020
@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 14, 2020

I upstreamed systemd/systemd#17580 which means a big patch less between nixos-systemd and upstream. This is included in rc2.

@Mic92 Mic92 force-pushed the systemd branch 3 times, most recently from 300f58b to 1880763 Compare November 14, 2020 13:56
@Mic92 Mic92 marked this pull request as ready for review November 15, 2020 09:24
@arianvp
Copy link
Copy Markdown
Member

arianvp commented Nov 15, 2020

We should make sure all our udev rules of all our packages are compatible before we can merge this. Due to the breaking changes in the handling of bind and unbind events.

@flokli
Copy link
Copy Markdown
Member

flokli commented Nov 15, 2020

[…] all our udev rules of all our packages are compatible before we can merge this […]

I'd say that's a bit ambitions, if not unrealistic, as this is all manual testing - or is there a easy search pattern to spot these incompatibilities?

Before merging, we should do a much more thorough testing of all the GUI VM tests, to spot regressions (and it'd help to have a Hydra jobset for this, so more people can test), but "Unstable" is the right place to track some of these regressions in less-popular components.

flokli
flokli reviewed Nov 15, 2020
View reviewed changes
@ofborg ofborg bot requested a review from flokli November 18, 2020 21:11
@flokli flokli changed the title systemd: 246.6 -> 247-rc2 systemd: 246.6 -> 247 Nov 26, 2020
@flokli
Copy link
Copy Markdown
Member

flokli commented Nov 26, 2020

247 was released, I updated this PR to drop systemd/systemd#17608 included in the final release, and reflowed the patches once more.

@flokli
Copy link
Copy Markdown
Member

flokli commented Dec 2, 2020

This needed another rebase apparently.

@Mic92 what's your take on this? Should we let this cook in staging a bit? I ran a bunch of tests, but can't rebuild the world ;-)

@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Dec 3, 2020

This needed another rebase apparently.

@Mic92 what's your take on this? Should we let this cook in staging a bit? I ran a bunch of tests, but can't rebuild the world ;-)

I am using this on my laptop for a while now.

@Mic92 Mic92 merged commit d4ac2c7 into NixOS:staging Dec 3, 2020
@Mic92 Mic92 deleted the systemd branch December 3, 2020 07:03
@Mic92 Mic92 restored the systemd branch December 3, 2020 07:03
@TredwellGit
Copy link
Copy Markdown
Member

TredwellGit commented Dec 5, 2020 •
edited
Loading

#105850 (comment)
#105747 (comment)
Reverting ef050bc unbreaks the packages.

@Mic92 Mic92 mentioned this pull request Dec 6, 2020
Merged
10 tasks
@andersk andersk mentioned this pull request Dec 13, 2020
Closed
@andersk
Copy link
Copy Markdown
Contributor

andersk commented Dec 13, 2020

This seems to have broken the channel-blocking networking.networkd.privacy test: #106858.

@FRidh
Copy link
Copy Markdown
Member

FRidh commented Dec 16, 2020

#106858

Friday evening I intend to revert the systemd upgrade unless there is a tested fix before then.

@hmenke hmenke mentioned this pull request Jan 6, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@andir andir Awaiting requested review from andir

@flokli flokli Awaiting requested review from flokli

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees

No one assigned

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 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.

Projects

systemd
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Mic92 @arianvp @flokli @TredwellGit @andersk @FRidh