diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-21 00:01:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 00:01:42 +0000 |
| commit | fc3ddb8979c080a501d6cd288b65d0be4493fb73 (patch) | |
| tree | e1dddece245eb5e998abbbf87c1cfff7ab28a18d /nixos/modules/system/activation | |
| parent | 03a4213c4f31401938b0079a00491023a92336ca (diff) | |
| parent | 63525691f22f121b1689241342b2fbfc4131cf5e (diff) | |
| download | nixpkgs-fc3ddb8979c080a501d6cd288b65d0be4493fb73.tar nixpkgs-fc3ddb8979c080a501d6cd288b65d0be4493fb73.tar.gz nixpkgs-fc3ddb8979c080a501d6cd288b65d0be4493fb73.tar.bz2 nixpkgs-fc3ddb8979c080a501d6cd288b65d0be4493fb73.tar.lz nixpkgs-fc3ddb8979c080a501d6cd288b65d0be4493fb73.tar.xz nixpkgs-fc3ddb8979c080a501d6cd288b65d0be4493fb73.tar.zst nixpkgs-fc3ddb8979c080a501d6cd288b65d0be4493fb73.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system/activation')
| -rw-r--r-- | nixos/modules/system/activation/activation-script.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index d6f14d01dba..c04d0fc16b2 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -56,6 +56,7 @@ let ln -sfn "$(readlink -f "$systemConfig")" /run/current-system # Prevent the current configuration from being garbage-collected. + mkdir -p /nix/var/nix/gcroots ln -sfn /run/current-system /nix/var/nix/gcroots/current-system exit $_status diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 8a5452a7cd5..92553ad3f16 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -148,7 +148,7 @@ in system.build = mkOption { internal = true; default = {}; - type = types.lazyAttrsOf types.unspecified; + type = with types; lazyAttrsOf (uniq unspecified); description = '' Attribute set of derivations used to setup the system. ''; |