Updating from trunk (specially for the enableFontDir option, as it was not up

to date for nixpkgs)


svn path=/nixos/branches/stdenv-updates/; revision=24871

3 files changed, 35 insertions, 0 deletions

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
new file mode 100644
index 00000000000..08559cc2a16
--- /dev/null
+++ b/modules/misc/deployment.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  options = {
+
+    deployment = mkOption {
+      description = ''
+        This option captures various custom attributes related to the configuration of the system, which
+        are not directly used for building a system configuration. Usually these attributes
+        are used by external tooling, such as the nixos-deploy-network tool or the Disnix Avahi
+        publisher.
+      '';
+      default = {};
+      example = {
+        description = "My production machine";
+	hostname = "my.test.org";
+	country = "NL";
+      };
+    };
+  };
+}
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 2db841194e3..f8219c23068 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -57,6 +57,7 @@ in
     cups = 36;
     foldingAtHome = 37;
     sabnzbd = 38;
+    kdm = 39;
     # When adding a uid, make sure it doesn't match an existing gid.
 
     nixbld = 30000; # start of range of uids
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 2fb61f686f0..154c619bd36 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -13,5 +13,16 @@
       '';
     };
 
+    nixpkgs.system = pkgs.lib.mkOption {
+      default = "";
+      description = ''
+        Specifies the Nix platform type for which NixOS should be built.
+        If unset, it defaults to the platform type of your host system
+        (<literal>${builtins.currentSystem}</literal>).
+        Specifying this option is useful when doing distributed
+        multi-platform deployment, or when building virtual machines.
+      '';
+    };
+
   };
 }