Skip to content

Commit

Permalink
docs(nix): Update doxygen version
Browse files Browse the repository at this point in the history
  • Loading branch information
RandomSpaceship committed Dec 2, 2024
1 parent 778fa1d commit 1fb71da
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
uv2nix,
pyproject-build-systems,
# non-python packages to build docs
doxygen,
unstable,
graphviz,
# ros version to link to with intersphinx - defaults to humble
rosDistro ? "humble",
Expand Down Expand Up @@ -48,7 +48,7 @@ let
name = "roar-docs-env";
paths = [
pyEnv
doxygen
unstable.doxygen
graphviz
];
};
Expand Down
20 changes: 20 additions & 0 deletions docs/nix/overlay.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
final: prev:
let
doxygen = prev.doxygen.overrideAttrs (
{ ... }:
rec {
version = "1.12.0";
patches = [ ];

src = prev.fetchFromGitHub {
owner = "doxygen";
repo = "doxygen";
rev = "Release_${prev.lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-4zSaM49TjOaZvrUChM4dNJLondCsQPSArOXZnTHS4yI=";
};
}
);
in
{
inherit doxygen;
}
4 changes: 2 additions & 2 deletions docs/nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
rosDistro,
mkShell,
env,
uv,
unstable,
drawio,
}:
# provide a dev shell environment for the docs - see pyproject docs:
Expand All @@ -16,7 +16,7 @@ let
ROS_DISTRO = rosDistro;
buildInputs = [
env
uv # uv added to manage python dependencies
unstable.uv # uv added to manage python dependencies - needs to be from unstable due to rapid development
drawio
];
shellHook = ''
Expand Down
7 changes: 4 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
ros = final.rosPackages.${rosDistro}.overrideScope (
rosFinal: rosPrev: { manualDomainId = toString productionDomainId; }
);
# override select packages with latest
inherit (pkgs-unstable) uv;
unstable = pkgs-unstable;
})
];
# Gazebo makes use of Freeimage.
Expand All @@ -83,6 +82,9 @@
# we don't need to apply overlays here since pkgs-unstable is only for pure python stuff
pkgs-unstable = import nixpkgs-unstable {
inherit system;
overlays = [
(import ./docs/nix/overlay.nix)
];
config.allowUnfree = true; # needed for draw.io for the docs
};

Expand Down Expand Up @@ -153,7 +155,6 @@
};

# --- PYTHON (UV) WORKSPACES ---
# note: called with pkgs-unstable since we need the uv tool to be up-to-date due to rapid development
# note: called with rosDistro to link correct intersphinx inventory
docs = pkgs.callPackage (import ./docs) {
inherit
Expand Down

0 comments on commit 1fb71da

Please sign in to comment.