upstart-jobs/manual.nix @@ -1,10 +1,10 @@ -{nixpkgsPath ? ../../../nixpkgs, pkgs ? null}: +{nixpkgsPath ? ../../../nixpkgs, nixpkgs ? null}: let - pkgs = if pkgs == null then + pkgs = if nixpkgs == null then import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {} - else pkgs; + else nixpkgs; options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" doc/manual/default.nix @@ -3063,5 +3063,6 @@ root ALL=(ALL) SETENV: ALL (import ../upstart-jobs/cron.nix) (import ../upstart-jobs/fcron.nix) (import ../upstart-jobs/cron/locate.nix) + (import ../upstart-jobs/manual.nix) ]; } system/options.nix @@ -1,6 +1,7 @@ { platform ? __currentSystem , configuration , nixpkgsPath ? ../../nixpkgs +, nixpkgs ? null }: rec { @@ -26,7 +27,9 @@ rec { pkgs configComponents config; - pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;}; + pkgs = if nixpkgs == null then + import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;} + else nixpkgs; manifests = config.installer.manifests; # exported here because nixos-rebuild uses it system/system.nix 37da7fcf05e1d93c5f7b924f90f38de2c6051c58 raskin raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb http://github.com/jpick/nixos-xen64-nixos/commit/01724b65970f41adf4a9e0565e7dfbcbe9ee9368 01724b65970f41adf4a9e0565e7dfbcbe9ee9368 2009-01-08T15:30:23-08:00 2009-01-08T15:30:23-08:00 An upstart job to display manual git-svn-id: https://svn.nixos.org/repos/nix/nixos/trunk@13728 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb c1a0a8d5094d4267cf5a0e8aac2efda643a005e0 raskin raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb