movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

Merge branch 'master' into closure-size

Browse source
This commit is contained in:
Luca Bruno 2015-12-11 18:31:00 +01:00
commit 5b0352a6a4
577 changed files with 28743 additions and 7413 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/loader/grub/grub.nix
View file

@ -470,7 +470,7 @@ in
] ++ flip concatMap cfg.mirroredBoots (args: [
{
assertion = args.devices != [ ];
message = "A boot path cannot have an empty devices string in ${arg.path}";
message = "A boot path cannot have an empty devices string in ${args.path}";
}
{
assertion = hasPrefix "/" args.path;

6
nixos/modules/system/boot/systemd.nix
View file

@ -148,6 +148,12 @@ let
# Misc.
"systemd-sysctl.service"
"dbus-org.freedesktop.timedate1.service"
"dbus-org.freedesktop.locale1.service"
"dbus-org.freedesktop.hostname1.service"
"systemd-timedated.service"
"systemd-localed.service"
"systemd-hostnamed.service"
]
++ cfg.additionalUpstreamSystemUnits;