dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge #223905: systemd: 253.1 -> 253.2

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2023-04-04 09:40:36 +02:00
commit fe6b652545
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/systemd/default.nix
View File

@ -117,6 +117,7 @@
, withTimedated ? true , withTimedated ? true
, withTimesyncd ? true , withTimesyncd ? true
, withTpm2Tss ? true , withTpm2Tss ? true
, withUkify ? false # adds python to closure which is too much by default
, withUserDb ? true , withUserDb ? true
, withUtmp ? !stdenv.hostPlatform.isMusl , withUtmp ? !stdenv.hostPlatform.isMusl
# tests assume too much system access for them to be feasible for us right now # tests assume too much system access for them to be feasible for us right now
@ -139,7 +140,7 @@ assert withHomed -> withPam;
let let
wantCurl = withRemote || withImportd; wantCurl = withRemote || withImportd;
wantGcrypt = withResolved || withImportd; wantGcrypt = withResolved || withImportd;
version = "253.1"; version = "253.2";
# Bump this variable on every (major) version change. See below (in the meson options list) for why. # Bump this variable on every (major) version change. See below (in the meson options list) for why.
# command: # command:
@ -156,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "systemd"; owner = "systemd";
repo = "systemd-stable"; repo = "systemd-stable";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PyAhkLxDkT5gVocCXh8bst6PBgguASjnA82xinQOtjw="; hash = "sha256-gtJEHLSeJoOSFnutn/+wM27sV9JiV5afsykyUd+XDKQ=";
}; };
# On major changes, or when otherwise required, you *must* reformat the patches, # On major changes, or when otherwise required, you *must* reformat the patches,
@ -349,7 +350,7 @@ stdenv.mkDerivation (finalAttrs: {
# when cross-compiling. # when cross-compiling.
+ '' + ''
shopt -s extglob shopt -s extglob
patchShebangs tools test src/!(rpm|kernel-install) src/kernel-install/test-kernel-install.sh patchShebangs tools test src/!(rpm|kernel-install|ukify) src/kernel-install/test-kernel-install.sh
''; '';
outputs = [ "out" "man" "dev" ]; outputs = [ "out" "man" "dev" ];
@ -414,6 +415,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ] ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ]
++ lib.optionals withLibBPF [ libbpf ] ++ lib.optionals withLibBPF [ libbpf ]
++ lib.optional withTpm2Tss tpm2-tss ++ lib.optional withTpm2Tss tpm2-tss
++ lib.optional withUkify (python3Packages.python.withPackages (ps: with ps; [ pefile ]))
; ;
#dontAddPrefix = true; #dontAddPrefix = true;
@ -510,11 +512,10 @@ stdenv.mkDerivation (finalAttrs: {
# more frequent development builds # more frequent development builds
"-Dman=true" "-Dman=true"
# Temporary disable the ukify tool. see https://github.com/NixOS/nixpkgs/pull/216826#issuecomment-1465228824
"-Dukify=false"
"-Defi=${lib.boolToString withEfi}" "-Defi=${lib.boolToString withEfi}"
"-Dgnu-efi=${lib.boolToString withEfi}" "-Dgnu-efi=${lib.boolToString withEfi}"
"-Dukify=${lib.boolToString withUkify}"
] ++ lib.optionals withEfi [ ] ++ lib.optionals withEfi [
"-Defi-libdir=${toString gnu-efi}/lib" "-Defi-libdir=${toString gnu-efi}/lib"
"-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-includedir=${toString gnu-efi}/include/efi"