mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 14:10:33 +03:00
Merge staging-next into staging
This commit is contained in:
commit
387a5e220d
79 changed files with 696 additions and 354 deletions
|
@ -66,9 +66,7 @@ in {
|
|||
uid = config.ids.uids.systemd-coredump;
|
||||
group = "systemd-coredump";
|
||||
};
|
||||
users.groups.systemd-coredump = {
|
||||
gid = mkIf (lib.versionAtLeast config.system.stateVersion "23.05") config.ids.gids.systemd-coredump;
|
||||
};
|
||||
users.groups.systemd-coredump = {};
|
||||
})
|
||||
|
||||
(mkIf (!cfg.enable) {
|
||||
|
|
|
@ -118,7 +118,7 @@ let
|
|||
name = "initrd-bin-env";
|
||||
paths = map getBin cfg.initrdBin;
|
||||
pathsToLink = ["/bin" "/sbin"];
|
||||
postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -s '${v}' $out/bin/'${n}'") cfg.extraBin);
|
||||
postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -sf '${v}' $out/bin/'${n}'") cfg.extraBin);
|
||||
};
|
||||
|
||||
initialRamdisk = pkgs.makeInitrdNG {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue