mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Revert "NixOS apply
script"
Reverts #344407 This has broken nixos-rebuild switch so that it no longer updates the profile, which has bad consequences including not updating the systemd-boot menu with new generations.
This commit is contained in:
parent
e8ecffc976
commit
37ee6ba681
16 changed files with 31 additions and 502 deletions
|
@ -40,30 +40,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
options.system.apply.enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = config.system.switch.enable;
|
||||
internal = true;
|
||||
description = ''
|
||||
Whether to include the `bin/apply` script.
|
||||
|
||||
Disabling puts `nixos-rebuild` in a legacy mode that won't be maintained
|
||||
and removes cheap and useful functionality. It's also slower over ssh.
|
||||
This should only be used for testing the `nixos-rebuild` command, to
|
||||
pretend that the configuration is an old NixOS.
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf config.system.apply.enable {
|
||||
system.activatableSystemBuilderCommands = ''
|
||||
mkdir -p $out/bin
|
||||
substitute ${./apply/apply.sh} $out/bin/apply \
|
||||
--subst-var-by bash ${lib.getExe pkgs.bash} \
|
||||
--subst-var-by toplevel ''${!toplevelVar}
|
||||
chmod +x $out/bin/apply
|
||||
'';
|
||||
})
|
||||
(lib.mkIf (config.system.switch.enable && !config.system.switch.enableNg) {
|
||||
warnings = [
|
||||
''
|
||||
|
@ -77,7 +54,7 @@ in
|
|||
];
|
||||
|
||||
system.activatableSystemBuilderCommands = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir $out/bin
|
||||
substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \
|
||||
--subst-var out \
|
||||
--subst-var-by toplevel ''${!toplevelVar} \
|
||||
|
@ -109,7 +86,7 @@ in
|
|||
(
|
||||
source ${pkgs.buildPackages.makeWrapper}/nix-support/setup-hook
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir $out/bin
|
||||
ln -sf ${lib.getExe pkgs.switch-to-configuration-ng} $out/bin/switch-to-configuration
|
||||
wrapProgram $out/bin/switch-to-configuration \
|
||||
--set OUT $out \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue