Loading .github/workflows/update-terraform-providers.yml +1 −1 Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ jobs: run: | git clean -f - name: create PR uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0 uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7.0.1 with: body: | Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action. Loading nixos/lib/testing/nixos-test-base.nix +7 −2 Original line number Diff line number Diff line Loading @@ -3,7 +3,7 @@ # even in `inheritParentConfig = false` specialisations. { lib, ... }: let inherit (lib) mkForce; inherit (lib) mkDefault mkForce; in { imports = [ Loading @@ -22,6 +22,11 @@ in label = mkForce "test"; }; } ({ config, ... }: { # Don't pull in switch-to-configuration by default, except when specialisations are involved. # This is mostly a Hydra optimization, so we don't rebuild all the tests every time switch-to-configuration-ng changes. key = "no-switch-to-configuration"; system.switch.enable = mkDefault (config.isSpecialisation || config.specialisation != {}); }) ]; } nixos/modules/installer/tools/nixos-install.sh +1 −0 Original line number Diff line number Diff line Loading @@ -245,6 +245,7 @@ if [[ -z $noBootLoader ]]; then ln -sfn /proc/mounts "$mountPoint"/etc/mtab export mountPoint NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF' set -e # Create a bind mount for each of the mount points inside the target file # system. This preserves the validity of their absolute paths after changing # the root with `nixos-enter`. Loading nixos/modules/system/activation/no-clone.nix +1 −0 Original line number Diff line number Diff line Loading @@ -5,4 +5,5 @@ with lib; { boot.loader.grub.device = mkOverride 0 "nodev"; specialisation = mkOverride 0 {}; isSpecialisation = mkOverride 0 true; } nixos/modules/system/activation/specialisation.nix +6 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ let in { options = { isSpecialisation = mkOption { type = lib.types.bool; internal = true; default = false; description = "Whether this system is a specialisation of another."; }; specialisation = mkOption { default = { }; Loading Loading
.github/workflows/update-terraform-providers.yml +1 −1 Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ jobs: run: | git clean -f - name: create PR uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0 uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7.0.1 with: body: | Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action. Loading
nixos/lib/testing/nixos-test-base.nix +7 −2 Original line number Diff line number Diff line Loading @@ -3,7 +3,7 @@ # even in `inheritParentConfig = false` specialisations. { lib, ... }: let inherit (lib) mkForce; inherit (lib) mkDefault mkForce; in { imports = [ Loading @@ -22,6 +22,11 @@ in label = mkForce "test"; }; } ({ config, ... }: { # Don't pull in switch-to-configuration by default, except when specialisations are involved. # This is mostly a Hydra optimization, so we don't rebuild all the tests every time switch-to-configuration-ng changes. key = "no-switch-to-configuration"; system.switch.enable = mkDefault (config.isSpecialisation || config.specialisation != {}); }) ]; }
nixos/modules/installer/tools/nixos-install.sh +1 −0 Original line number Diff line number Diff line Loading @@ -245,6 +245,7 @@ if [[ -z $noBootLoader ]]; then ln -sfn /proc/mounts "$mountPoint"/etc/mtab export mountPoint NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF' set -e # Create a bind mount for each of the mount points inside the target file # system. This preserves the validity of their absolute paths after changing # the root with `nixos-enter`. Loading
nixos/modules/system/activation/no-clone.nix +1 −0 Original line number Diff line number Diff line Loading @@ -5,4 +5,5 @@ with lib; { boot.loader.grub.device = mkOverride 0 "nodev"; specialisation = mkOverride 0 {}; isSpecialisation = mkOverride 0 true; }
nixos/modules/system/activation/specialisation.nix +6 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ let in { options = { isSpecialisation = mkOption { type = lib.types.bool; internal = true; default = false; description = "Whether this system is a specialisation of another."; }; specialisation = mkOption { default = { }; Loading