diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-19 22:59:25 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-19 22:59:25 +0200 |
| commit | 4fb50f071f18279048bfd67267146aaec379e01d (patch) | |
| tree | c02988f7ee1b5234455c75157a3083b7249459e6 | |
| parent | 18a7ce76fcf80389bc8db2dd3e961a74637b5162 (diff) | |
Manual: Typo fixes
| -rw-r--r-- | nixos/doc/manual/configuration.xml | 2 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index 1dff9d2f21e5..0ffee826dc49 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -935,7 +935,7 @@ environment.systemPackages = [ (import ./my-hello.nix) ]; </programlisting> where <filename>my-hello.nix</filename> contains: <programlisting> -with <nixpkgs> {}; # bring all of Nixpkgs into scope +with import <nixpkgs> {}; # bring all of Nixpkgs into scope stdenv.mkDerivation rec { name = "hello-2.8"; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index eced13444de2..75ec6671d156 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -450,7 +450,7 @@ in extraModules = mkOption { type = types.listOf types.unspecified; default = []; - example = literalExample ''[ "proxy_connect" { name = "php5"; path = "''${php}/modules/libphp5.so"; } ]''; + example = literalExample ''[ "proxy_connect" { name = "php5"; path = "''${pkgs.php}/modules/libphp5.so"; } ]''; description = '' Additional Apache modules to be used. These can be specified as a string in the case of modules distributed |