diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-01 16:44:03 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-01 16:47:29 +0100 |
| commit | 9ef07d859b23840e1a5d7d7125a6982720afa391 (patch) | |
| tree | 5e234cbbc8a44ba4ae6b28727d1641e621f1e78e /nixos | |
| parent | dac108f51ba2eff7e5fdcc425879c53ee79ddd6c (diff) | |
| download | nixpkgs-9ef07d859b23840e1a5d7d7125a6982720afa391.tar nixpkgs-9ef07d859b23840e1a5d7d7125a6982720afa391.tar.gz nixpkgs-9ef07d859b23840e1a5d7d7125a6982720afa391.tar.bz2 nixpkgs-9ef07d859b23840e1a5d7d7125a6982720afa391.tar.lz nixpkgs-9ef07d859b23840e1a5d7d7125a6982720afa391.tar.xz nixpkgs-9ef07d859b23840e1a5d7d7125a6982720afa391.tar.zst nixpkgs-9ef07d859b23840e1a5d7d7125a6982720afa391.zip | |
Include the NixOS version in the manual
In particular, this will make it clear what version of the manual is shown at http://nixos.org/nixos/manual/.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/default.nix | 5 | ||||
| -rw-r--r-- | nixos/doc/manual/manual.xml | 1 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index db3245fcc07..6d5039e8177 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -1,6 +1,4 @@ -{ pkgs, options -, revision ? "master" -}: +{ pkgs, options, version, revision }: with pkgs.lib; @@ -60,6 +58,7 @@ in rec { buildCommand = '' ln -s $sources/*.xml . # */ ln -s ${optionsDocBook} options-db.xml + echo "${version}" > version # Check the validity of the manual sources. xmllint --noout --nonet --xinclude --noxincludenode \ diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index dfbd865b505..6e13281cbd9 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -5,6 +5,7 @@ <info> <title>NixOS Manual</title> + <subtitle>Version <xi:include href="version" parse="text" /></subtitle> <author> <personname> diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 885b8fa2d0c..1a8b85db329 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -23,6 +23,7 @@ let manual = import ../../../doc/manual { inherit pkgs; + version = config.system.nixosVersion; revision = config.system.nixosRevision; options = eval.options; }; |