diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 053b64e9..44867016 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -8,11 +8,11 @@ jobs: - name: retrieve merge target info run: git fetch origin $GITHUB_BASE_REF - run: sudo apt-get update - - run: sudo apt-get install -y clang-format-12 + - run: sudo apt-get install -y clang-format-17 - name: run git-clang-format run: | target=$(git rev-parse origin/$GITHUB_BASE_REF) - git-clang-format-12 --quiet --diff $target > clang-format-diff + git-clang-format-17 --quiet --diff $target > clang-format-diff lint=$(grep -v --color=never "no modified files to format" clang-format-diff || true) if [ ! -z "$lint" ]; then echo "format errors, inspect the clang-format-diff artifact for info"; exit 1; else exit 0; fi shell: bash @@ -34,5 +34,5 @@ jobs: fetch-depth: 0 - uses: cachix/install-nix-action@v13 with: - nix_path: nixpkgs=channel:nixos-22.05 + nix_path: nixpkgs=channel:nixos-24.05 - run: nix-shell --command "./autogen.sh; ./configure --enable-docs; make html" diff --git a/default.nix b/default.nix index af0044c3..93552dd7 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/22.05.tar.gz") {} +{ pkgs ? import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/24.05.tar.gz") {} }: pkgs // rec { stdenv = pkgs.gcc12Stdenv; diff --git a/doc/tutorials/hello_world/hello_world.rst b/doc/tutorials/hello_world/hello_world.rst index 058a1b2f..0ccf7ab2 100644 --- a/doc/tutorials/hello_world/hello_world.rst +++ b/doc/tutorials/hello_world/hello_world.rst @@ -12,9 +12,9 @@ APIs Setup/Teardown API ~~~~~~~~~~~~~~~~~~ -.. doxygenfunction:: aml_init +.. doxygengroup:: aml + :content-only: -.. doxygenfunction:: aml_finalize Version API ~~~~~~~~~~~ diff --git a/shell.nix b/shell.nix index 5799a889..cdc12292 100644 --- a/shell.nix +++ b/shell.nix @@ -3,7 +3,7 @@ with pkgs; mkShell.override { stdenv = pkgs.stdenv; } { inputsFrom = [ aml ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconf ]; buildInputs = [ # deps for docs graphviz