Skip to content

[Backport staging-23.11] systemd: 254.3 -> 254.6#268917

Merged
flokli merged 1 commit intostaging-23.11from
backport-267802-to-staging-23.11
Nov 23, 2023
Merged

[Backport staging-23.11] systemd: 254.3 -> 254.6#268917
flokli merged 1 commit intostaging-23.11from
backport-267802-to-staging-23.11

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Nov 21, 2023

Bot-based backport to staging-23.11, triggered by a label in #267802.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

@github-actions github-actions bot requested a review from a team as a code owner November 21, 2023 09:39
@github-actions github-actions bot mentioned this pull request Nov 21, 2023
Merged
15 tasks
@lilyinstarlight
Copy link
Copy Markdown
Member

lilyinstarlight commented Nov 21, 2023

@ofborg eval

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 22, 2023
@lilyinstarlight
systemd: 254.3 -> 254.6
7426eab 
(cherry picked from commit f4b8339)
@lilyinstarlight lilyinstarlight force-pushed the backport-267802-to-staging-23.11 branch from 7662a64 to 7426eab Compare November 22, 2023 02:45
@github-actions github-actions bot added the 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. label Nov 22, 2023
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 22, 2023
@ofborg ofborg bot requested review from flokli and kloenk November 22, 2023 05:02
@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 22, 2023
@flokli
Copy link
Copy Markdown
Member

flokli commented Nov 23, 2023

This broken check seems unrelated:

Run echo "Fetching latest version of channel $channel"
Fetching latest version of channel nixos-23.11
warning: Nix search path entry 'channel:nixos-23.11' cannot be downloaded, ignoring
error: file 'nixpkgs' was not found in the Nix search path (add it using $NIX_PATH or -I)

       at «none»:0: (source not available)
Error: Process completed with exit code 1.

@flokli flokli merged commit ba74a39 into staging-23.11 Nov 23, 2023
@flokli flokli deleted the backport-267802-to-staging-23.11 branch November 23, 2023 09:47
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Nov 29, 2023 •
edited
Loading

This broke mkosi, as it patches systemd and that fails now. Maintainers: @malt3, @katexochen
https://hydra.nixos.org/build/242577615/nixlog/2/tail

@katexochen
Copy link
Copy Markdown
Contributor

katexochen commented Nov 29, 2023

Mkosi fix is on its way.

@katexochen katexochen mentioned this pull request Nov 29, 2023
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kloenk kloenk Awaiting requested review from kloenk

@flokli flokli Awaiting requested review from flokli

Assignees

No one assigned

Labels

6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 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

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lilyinstarlight @flokli @vcunat @katexochen