Skip to content

[staging] systemd: 249.7 -> 250 #151932

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

Closed
jonringer wants to merge 1 commit into from
Closed

[staging] systemd: 249.7 -> 250 #151932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 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 @@ -123,7 +123,7 @@ assert withHomed -> withCryptsetup;
assert withCryptsetup -> (cryptsetup != null);
let
wantCurl = withRemote || withImportd;
version = "249.7";
version = "250";
in
stdenv.mkDerivation {
inherit pname version;
Expand All @@ -134,7 +134,7 @@ stdenv.mkDerivation {
owner = "systemd";
repo = "systemd-stable";
rev = "v${version}";
sha256 = "sha256-y33/BvvI+JyhsvuT1Cbm6J2Z72j71oXgLw6X9NwCMPE=";
sha256 = "sha256-H1k9NeAGAQNDqzrksl27fd3/ZnebUcsl3Kr+jp7Qv9Q=";
};

# If these need to be regenerated, `git am path/to/00*.patch` them into a
Expand Down Expand Up @@ -246,6 +246,10 @@ stdenv.mkDerivation {
# bpf compilation support
{ name = "libbpf.so.0"; pkg = opt withLibBPF libbpf; }

# For parsing of elf files
{ name = "libdw.so.1"; pkg = opt withCoredump elfutils; }
{ name = "libelf.so.1"; pkg = opt withCoredump elfutils; }

# We did never provide support for libxkbcommon & qrencode
{ name = "libxkbcommon.so.0"; pkg = null; }
{ name = "libqrencode.so.4"; pkg = null; }
Expand Down Expand Up @@ -369,7 +373,6 @@ stdenv.mkDerivation {
++ lib.optional withApparmor libapparmor
++ lib.optional wantCurl (lib.getDev curl)
++ lib.optionals withCompression [ bzip2 lz4 xz zstd ]
++ lib.optional withCoredump elfutils
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi
++ lib.optional withKexectools kexec-tools
Expand Down Expand Up @@ -435,7 +438,7 @@ stdenv.mkDerivation {
"-Dsmack=true"
"-Db_pie=true"
"-Dinstall-sysconfdir=false"
"-Defi-ld=${stdenv.cc.bintools.targetPrefix}ld"
"-Defi-ld=auto"
/*
As of now, systemd doesn't allow runtime configuration of these values. So
the settings in /etc/login.defs have no effect on it. Many people think this
Expand Down