Skip to content

Commit 51c891e

Browse files
authored
[ci] update clang and nix versions (#241)
They were getting old.
1 parent 542ead2 commit 51c891e

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/style.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
- name: retrieve merge target info
99
run: git fetch origin $GITHUB_BASE_REF
1010
- run: sudo apt-get update
11-
- run: sudo apt-get install -y clang-format-12
11+
- run: sudo apt-get install -y clang-format-17
1212
- name: run git-clang-format
1313
run: |
1414
target=$(git rev-parse origin/$GITHUB_BASE_REF)
15-
git-clang-format-12 --quiet --diff $target > clang-format-diff
15+
git-clang-format-17 --quiet --diff $target > clang-format-diff
1616
lint=$(grep -v --color=never "no modified files to format" clang-format-diff || true)
1717
if [ ! -z "$lint" ]; then echo "format errors, inspect the clang-format-diff artifact for info"; exit 1; else exit 0; fi
1818
shell: bash
@@ -34,5 +34,5 @@ jobs:
3434
fetch-depth: 0
3535
- uses: cachix/install-nix-action@v13
3636
with:
37-
nix_path: nixpkgs=channel:nixos-22.05
37+
nix_path: nixpkgs=channel:nixos-24.05
3838
- run: nix-shell --command "./autogen.sh; ./configure --enable-docs; make html"

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs ? import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/22.05.tar.gz") {}
1+
{ pkgs ? import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/24.05.tar.gz") {}
22
}:
33
pkgs // rec {
44
stdenv = pkgs.gcc12Stdenv;

doc/tutorials/hello_world/hello_world.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ APIs
1212
Setup/Teardown API
1313
~~~~~~~~~~~~~~~~~~
1414

15-
.. doxygenfunction:: aml_init
15+
.. doxygengroup:: aml
16+
:content-only:
1617

17-
.. doxygenfunction:: aml_finalize
1818

1919
Version API
2020
~~~~~~~~~~~

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
with pkgs;
44
mkShell.override { stdenv = pkgs.stdenv; } {
55
inputsFrom = [ aml ];
6-
nativeBuildInputs = [ autoreconfHook pkgconfig ];
6+
nativeBuildInputs = [ autoreconfHook pkgconf ];
77
buildInputs = [
88
# deps for docs
99
graphviz

0 commit comments

Comments
 (0)