diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-24 19:58:34 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-24 19:58:34 +0200 |
| commit | 20150b1cee1ec86e50e2e1c2a75d45499ccd80d4 (patch) | |
| tree | cc705e1007b0bee6167610dffa72fa6d07f3f6e4 /nixos/modules/services/misc | |
| parent | d5af9bc5831b73b87c2d20b014f03b416a981327 (diff) | |
| download | nixlib-20150b1cee1ec86e50e2e1c2a75d45499ccd80d4.tar nixlib-20150b1cee1ec86e50e2e1c2a75d45499ccd80d4.tar.gz nixlib-20150b1cee1ec86e50e2e1c2a75d45499ccd80d4.tar.bz2 nixlib-20150b1cee1ec86e50e2e1c2a75d45499ccd80d4.tar.lz nixlib-20150b1cee1ec86e50e2e1c2a75d45499ccd80d4.tar.xz nixlib-20150b1cee1ec86e50e2e1c2a75d45499ccd80d4.tar.zst nixlib-20150b1cee1ec86e50e2e1c2a75d45499ccd80d4.zip | |
Ensure that the manual job gets build with the right revision info
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index c522868c1d98..a593d05ee628 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -11,12 +11,15 @@ let cfg = config.services.nixosManual; + versionModule = + { system.nixosVersionSuffix = config.system.nixosVersionSuffix; + system.nixosRevision = config.system.nixosRevision; + }; + manual = import ../../../doc/manual { inherit pkgs; - revision = - let fn = "${toString pkgs.path}/.git-revision"; - in if pathExists fn then readFile fn else "master"; - options = (fixMergeModules baseModules + revision = config.system.nixosRevision; + options = (fixMergeModules ([ versionModule ] ++ baseModules) (removeAttrs extraArgs ["config" "options"]) // { modules = [ ]; }).options; |