Skip to content

Commit e9ba840

Browse files
committed
Merge branch 'devel' into topic/coal
2 parents 3e481af + 6b9f9c8 commit e9ba840

File tree

4 files changed

+125
-1
lines changed

4 files changed

+125
-1
lines changed

.github/workflows/nix.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "CI - Nix"
2+
3+
on:
4+
push:
5+
6+
jobs:
7+
nix:
8+
runs-on: "${{ matrix.os }}-latest"
9+
strategy:
10+
matrix:
11+
os: [ubuntu, macos]
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: cachix/install-nix-action@v27
15+
- uses: cachix/cachix-action@v15
16+
with:
17+
name: gepetto
18+
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
19+
- run: nix build -L

CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
5454
- Fix unsupported function for contact_patch_matrix
5555
- Fix Octomap dependency on ROS
5656

57+
## [2.4.5] - 2024-07-28
58+
59+
### Fixed
60+
- Fix Octomap dependency on ROS
61+
5762
## [2.4.4] - 2024-03-06
5863

5964
## [2.4.3] - 2024-03-06
@@ -520,7 +525,8 @@ Now Eigen is at the heart of linear algebra computations.
520525
First release
521526

522527

523-
[Unreleased]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.4...HEAD
528+
[Unreleased]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.5...HEAD
529+
[2.4.5]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.4...v2.4.5
524530
[2.4.4]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.3...v2.4.4
525531
[2.4.3]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.2...v2.4.3
526532
[2.4.2]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.1...v2.4.2

flake.lock

+57
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
description = "An extension of the Flexible Collision Library";
3+
4+
inputs = {
5+
flake-parts.url = "github:hercules-ci/flake-parts";
6+
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
7+
# use gepetto fork until https://github.com/NixOS/nixpkgs/pull/337549
8+
nixpkgs.url = "github:gepetto/nixpkgs";
9+
};
10+
11+
outputs =
12+
inputs:
13+
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
14+
systems = inputs.nixpkgs.lib.systems.flakeExposed;
15+
perSystem =
16+
{ pkgs, self', ... }:
17+
{
18+
apps.default = {
19+
type = "app";
20+
program = pkgs.python3.withPackages (_: [ self'.packages.default ]);
21+
};
22+
devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
23+
packages = {
24+
default = self'.packages.hpp-fcl;
25+
hpp-fcl = pkgs.python3Packages.hpp-fcl.overrideAttrs (_: {
26+
src = pkgs.lib.fileset.toSource {
27+
root = ./.;
28+
fileset = pkgs.lib.fileset.unions [
29+
./CMakeLists.txt
30+
./doc
31+
./include
32+
./package.xml
33+
./python
34+
./src
35+
./test
36+
];
37+
};
38+
});
39+
};
40+
};
41+
};
42+
}

0 commit comments

Comments
 (0)