summary refs log tree commit diff
path: root/nixos/doc/manual/man-nixos-build-vms.xml
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-04-05 15:22:45 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-04-06 12:41:44 -0400
commitc6f7d4367894047592cc412740f0c1f5b2ca2b59 (patch)
tree0079c8f9633c2c48e2e57459eb4e40ee17bb31f8 /nixos/doc/manual/man-nixos-build-vms.xml
parent15a2dca15c25279843374003c8ae553e3b4af385 (diff)
downloadnixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar
nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.gz
nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.bz2
nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.lz
nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.xz
nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.tar.zst
nixpkgs-c6f7d4367894047592cc412740f0c1f5b2ca2b59.zip
nixpkgs module: Clean up platform options
 - `localSystem` is added, it strictly supercedes system

 - `crossSystem`'s description mentions `localSystem` (and vice versa).

 - No more weird special casing I don't even understand

TEMP
Diffstat (limited to 'nixos/doc/manual/man-nixos-build-vms.xml')
-rw-r--r--nixos/doc/manual/man-nixos-build-vms.xml6
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 878ebee0527..f4b59a7c6d4 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