Unverified Commit 6fc4c1c4 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #268574 from hercules-ci/linux-builder-no-eval 

darwin.linux-builder: Disable evaluation
parents 7da99477 f3e9d7f8

nixos/modules/installer/tools/tools.nix

+6 −3
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ in 
    '';

  };



  config = lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) {

  config = lib.mkMerge [ (lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) {



    system.nixos-generate-config.configuration = mkDefault ''

      # Edit this configuration file to define what should be installed on
@@ -257,10 +257,13 @@ in 


    documentation.man.man-db.skipPackages = [ nixos-version ];



  })



  # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.

  ({

    system.build = {

      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter;

    };



  };

  })];



}

nixos/modules/profiles/macos-builder.nix

+13 −0
Original line number Diff line number Diff line
@@ -103,6 +103,19 @@ in 
    # server that QEMU provides (normally 10.0.2.3)

    networking.nameservers = [ "8.8.8.8" ];



    # The linux builder is a lightweight VM for remote building; not evaluation.

    nix.channel.enable = false;

    # remote builder uses `nix-daemon` (ssh-ng:) or `nix-store --serve` (ssh:)

    # --force: do not complain when missing

    # TODO: install a store-only nix

    #       https://github.com/NixOS/rfcs/blob/master/rfcs/0134-nix-store-layer.md#detailed-design

    environment.extraSetup = ''

      rm --force $out/bin/{nix-instantiate,nix-build,nix-shell,nix-prefetch*,nix}

    '';

    # Deployment is by image.

    # TODO system.switch.enable = false;?

    system.disableInstallerTools = true;



    nix.settings = {

      auto-optimise-store = true;