Skip to content

[Backport staging-25.11] systemd: 258.2 -> 258.3 #474788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arianvp merged 3 commits into from
Dec 28, 2025
Merged

[Backport staging-25.11] systemd: 258.2 -> 258.3 #474788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b76e8b
systemd: 258.2 -> 258.3
arianvp Dec 18, 2025
01eefe7
systemd: remove systemd-initrd-luks-unl0kr from passthru
arianvp Dec 25, 2025
e2fd562
nixos/tests/systemd-boot: only run tests on x86_64-linux
arianvp Dec 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions nixos/tests/systemd-boot.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ in
}
);

basicXbootldr = runTest (
# TODO: Fix on aarch64-linux
basicXbootldr = runTestOn [ "x86_64-linux" ] (
{ lib, ... }:
{
name = "systemd-boot-xbootldr";
Expand Down Expand Up @@ -282,7 +283,8 @@ in
}
);

update = runTest (
# TODO: Fix on aarch64-linux
update = runTestOn [ "x86_64-linux" ] (
{ lib, ... }:
{
name = "systemd-boot-update";
Expand Down Expand Up @@ -457,7 +459,8 @@ in
}
);

entryFilenameXbootldr = runTest (
# TODO: Fix on aarch64-linux
entryFilenameXbootldr = runTestOn [ "x86_64-linux" ] (
{ lib, ... }:
{
name = "systemd-boot-entry-filename-xbootldr";
Expand Down
5 changes: 2 additions & 3 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
inherit pname;
version = "258.2";
version = "258.3";

src = fetchFromGitHub {
owner = "systemd";
repo = "systemd";
rev = "v${finalAttrs.version}";
hash = "sha256-1iWeuNefDOIEUSTzxzvt+jfcs6sSMPhxQfdwp0mqUjQ=";
hash = "sha256-wpg/0z7xrB8ysPaa/zNp1mz+yYRCGyXz0ODZcKapovM=";
};

# On major changes, or when otherwise required, you *must* :
Expand Down Expand Up @@ -956,7 +956,6 @@ stdenv.mkDerivation (finalAttrs: {
systemd-initrd-luks-empty-passphrase
systemd-initrd-luks-password
systemd-initrd-luks-tpm2
systemd-initrd-luks-unl0kr
systemd-initrd-modprobe
systemd-initrd-shutdown
systemd-initrd-simple
Expand Down
Loading