Skip to content

Commit

Permalink
Merge branch 'treewide/add-manuals'
Browse files Browse the repository at this point in the history
  • Loading branch information
Guanran928 committed Jan 17, 2025
2 parents 6690465 + 49b0f93 commit d722f69
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions nixos/modules/misc/documentation.nix
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ in
# The actual implementation for this lives in man-db.nix or mandoc.nix,
# depending on which backend is active.
(mkIf cfg.man.enable {
environment.systemPackages = [ pkgs.man-pages ];
environment.pathsToLink = [ "/share/man" ];
environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";
})
Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/services/logging/logrotate.nix
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,12 @@ in
};

config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.logrotate ];
systemd.services.logrotate = {
description = "Logrotate Service";
documentation = [
"man:logrotate(8)"
"man:logrotate(5)"
"man:logrotate.conf(5)"
];
startAt = "hourly";

Expand Down
1 change: 1 addition & 0 deletions nixos/modules/services/system/zram-generator.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ in
systemd.packages = [ cfg.package ];
systemd.services."systemd-zram-setup@".path = [ pkgs.util-linux ]; # for mkswap

environment.systemPackages = [ cfg.package ];
environment.etc."systemd/zram-generator.conf".source = settingsFormat.generate "zram-generator.conf" cfg.settings;
};
}
1 change: 1 addition & 0 deletions pkgs/by-name/db/dbus-broker/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
# error when using a kernel that's too old
"-D=linux-4-17=true"
"-D=system-console-users=gdm,sddm,lightdm"
"-D=docs=true"
];

PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
Expand Down

0 comments on commit d722f69

Please sign in to comment.