Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions doc/tutorials/hello_world/hello_world.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ APIs
Setup/Teardown API
~~~~~~~~~~~~~~~~~~

.. doxygenfunction:: aml_init
.. doxygengroup:: aml
:content-only:

.. doxygenfunction:: aml_finalize

Version API
~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
with pkgs;
mkShell.override { stdenv = pkgs.stdenv; } {
inputsFrom = [ aml ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkgconf ];
buildInputs = [
# deps for docs
graphviz
Expand Down