diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-04-19 14:59:58 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-19 14:59:58 -0400 |
commit | 53686e89951f33906cb1a8d7d5badc4671ae90e4 (patch) | |
tree | 076559719b8cc7d959be64abf6a585f5831bc90c /nixos/doc | |
parent | 7287129e51be7b99e9896c3401bd4c4c9c3dd1de (diff) | |
parent | c6f7d4367894047592cc412740f0c1f5b2ca2b59 (diff) | |
download | nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.gz nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.bz2 nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.lz nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.xz nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.zst nixlib-53686e89951f33906cb1a8d7d5badc4671ae90e4.zip |
Merge pull request #38485 from obsidiansystems/nixos-nixpkgs-options
nixpkgs module: Clean up platform options
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/man-nixos-build-vms.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml index 878ebee05273..f4b59a7c6d4b 100644 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ b/nixos/doc/manual/man-nixos-build-vms.xml @@ -40,7 +40,7 @@ points to the generated virtual network. test1 = {pkgs, config, ...}: { services.openssh.enable = true; - nixpkgs.system = "i686-linux"; + nixpkgs.localSystem.system = "i686-linux"; deployment.targetHost = "test1.example.net"; # Other NixOS options @@ -51,7 +51,7 @@ points to the generated virtual network. services.openssh.enable = true; services.httpd.enable = true; environment.systemPackages = [ pkgs.lynx ]; - nixpkgs.system = "x86_64-linux"; + nixpkgs.localSystem.system = "x86_64-linux"; deployment.targetHost = "test2.example.net"; # Other NixOS options @@ -66,7 +66,7 @@ In each NixOS configuration, two attributes have a special meaning. The <varname>deployment.targetHost</varname> specifies the address (domain name or IP address) of the system which is used by <command>ssh</command> to perform -remote deployment operations. The <varname>nixpkgs.system</varname> +remote deployment operations. The <varname>nixpkgs.localSystem.system</varname> attribute can be used to specify an architecture for the target machine, such as <varname>i686-linux</varname> which builds a 32-bit NixOS configuration. Omitting this property will build the configuration |