Rename environment.extraPackages to environment.systemPackages.
svn path=/nixos/trunk/; revision=17705
This commit is contained in:
parent
43b3ccc620
commit
2e34baba3b
@ -125,7 +125,7 @@ in
|
|||||||
system.boot.loader.id = "grub";
|
system.boot.loader.id = "grub";
|
||||||
system.boot.loader.kernelFile = "vmlinuz";
|
system.boot.loader.kernelFile = "vmlinuz";
|
||||||
|
|
||||||
environment.extraPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
|
environment.systemPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
|
||||||
|
|
||||||
# and many other things that have to be moved inside this file.
|
# and many other things that have to be moved inside this file.
|
||||||
|
|
||||||
|
@ -160,5 +160,5 @@ in
|
|||||||
{
|
{
|
||||||
require = options;
|
require = options;
|
||||||
|
|
||||||
environment.extraPackages = [nixosCheckout];
|
environment.systemPackages = [nixosCheckout];
|
||||||
}
|
}
|
||||||
|
@ -87,5 +87,5 @@ mkIf cfg.directDelivery {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.extraPackages = [pkgs.ssmtp];
|
environment.systemPackages = [pkgs.ssmtp];
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ mkIf config.services.pulseaudio.enable {
|
|||||||
];
|
];
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
extraPackages = [pkgs.pulseaudio];
|
systemPackages = [pkgs.pulseaudio];
|
||||||
};
|
};
|
||||||
|
|
||||||
users = {
|
users = {
|
||||||
|
@ -192,7 +192,7 @@ mkIf cfg.enable {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
extraPackages = [pkgs.nagios];
|
systemPackages = [pkgs.nagios];
|
||||||
};
|
};
|
||||||
|
|
||||||
users = {
|
users = {
|
||||||
|
@ -140,7 +140,7 @@ mkIf cfg.enable {
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
extraPackages = [avahi];
|
systemPackages = [avahi];
|
||||||
};
|
};
|
||||||
|
|
||||||
users = {
|
users = {
|
||||||
|
@ -70,7 +70,7 @@ in
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
extraPackages = [pkgs.cron];
|
systemPackages = [pkgs.cron];
|
||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
@ -107,7 +107,7 @@ in
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
extraPackages = ifEnabled [pkgs.fcron];
|
systemPackages = ifEnabled [pkgs.fcron];
|
||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
@ -67,7 +67,7 @@ cat > /mnt/etc/nixos/configuration.nix <<EOF
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
extraPackages = [
|
systemPackages = [
|
||||||
pkgs.socat (pkgs.lowPrio pkgs.nixUnstable)
|
pkgs.socat (pkgs.lowPrio pkgs.nixUnstable)
|
||||||
];
|
];
|
||||||
nix = pkgs.nixCustomFun (pkgs.nixUnstable.src)
|
nix = pkgs.nixCustomFun (pkgs.nixUnstable.src)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user