Skip to content

Fix CI and evaluation errors#634

Merged
magnouvean merged 6 commits into
nix-community:trunkfrom
bmrips:fixes
Jul 8, 2026
Merged

Fix CI and evaluation errors#634
magnouvean merged 6 commits into
nix-community:trunkfrom
bmrips:fixes

Conversation

@bmrips

@bmrips bmrips commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

CI and config evaluation throw various errors which this PR fixes:

  • chore(nix-render-docs): --toc-depth and --section-toc-depth have been renamed to --sidebar-depth.
  • chore(ci): replace pkgs.nixfmt-rfc-style by pkgs.nixfmt since the RFC style was finalized and adopted.
  • refactor(okular):
    • combine config attributes to enable local, shared let-bindings and to require a single lib.mkIf cfg.enable guard only.
    • use with lib.types; locally since usage of with <attrs>; in a big scope is discouraged.
    • float getIndexFromEnum to its use site
  • fix(okular): handle general.showMenuBar == null; otherwise evaluation of the Okular module fails.

bmrips added 6 commits July 8, 2026 11:00
The following options have been renamed upstream:
- `--toc-depth` -> `--sidebar-depth`
- `--section-toc-depth` -> `--sidebar-depth`
The RFC style was finalized and adopted.
This enables local, shared let-bindings and requires a single `lib.mkIf
cfg.enable` guard only.
Usage of `with <attrs>;` on a big scope is discouraged.
@bmrips bmrips changed the title Various fixes Fix CI and evaluation errors Jul 8, 2026

@magnouvean magnouvean left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool!

@magnouvean magnouvean merged commit a8c7804 into nix-community:trunk Jul 8, 2026
1 check passed
@bmrips bmrips deleted the fixes branch July 8, 2026 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants