0
0
Fork 0
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:
github-actions[bot] 2023-02-28 00:03:08 +00:00 committed by GitHub
commit 387a5e220d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
79 changed files with 696 additions and 354 deletions

View file

@ -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) {

View file

@ -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 {