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
1 change: 1 addition & 0 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
nix:
runs-on: "${{ matrix.os }}-latest"
strategy:
fail-fast: false
matrix:
os: [ubuntu]
steps:
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ci:
autoupdate_schedule: quarterly
repos:
- repo: https://github.com/BlankSpruce/gersemi
rev: 0.26.1
- repo: https://github.com/BlankSpruce/gersemi-pre-commit
rev: 0.27.1
hooks:
- id: gersemi
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.9
rev: v0.15.10
hooks:
- id: ruff-check
- id: ruff-format
Expand All @@ -15,7 +15,7 @@ repos:
hooks:
- id: toml-sort-fix
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v22.1.2
rev: v22.1.3
hooks:
- id: clang-format
args:
Expand Down
106 changes: 32 additions & 74 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 16 additions & 41 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,30 @@

inputs = {
gepetto.url = "github:gepetto/nix";
flake-parts.follows = "gepetto/flake-parts";
systems.follows = "gepetto/systems";
treefmt-nix.follows = "gepetto/treefmt-nix";

# https://github.com/humanoid-path-planner/hpp-manipulation/pull/262
hpp-manipulation.url = "github:humanoid-path-planner/hpp-manipulation";
hpp-manipulation.inputs.gepetto.follows = "gepetto";

# https://github.com/humanoid-path-planner/hpp-core/pull/429
hpp-core.url = "github:humanoid-path-planner/hpp-core";
hpp-core.url = "github:humanoid-path-planner/hpp-core/pull/434/head";
hpp-core.inputs.gepetto.follows = "gepetto";
};

outputs =
inputs:
inputs.flake-parts.lib.mkFlake { inherit inputs; } (
inputs.gepetto.lib.mkFlakoboros inputs (
{ lib, ... }:
{
systems = import inputs.systems;
imports = [
inputs.gepetto.flakeModule
{
flakoboros = {
overlays = [
inputs.hpp-core.overlays.flakoboros
inputs.hpp-manipulation.overlays.flakoboros
];
pyOverrideAttrs.hpp-python =
_: python-final:
(super: {
buildInputs = [ python-final.boost ] ++ super.buildInputs;
propagatedBuildInputs = super.propagatedBuildInputs ++ [
python-final.lxml
];
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [
./CMakeLists.txt
./doc
./include
./package.xml
./src
./tests
];
};
});
};
}
];
overlays = [ inputs.hpp-core.overlays.flakoboros ];
pyOverrideAttrs.hpp-python = {
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [
./CMakeLists.txt
./doc
./include
./package.xml
./src
./tests
];
};
};
}
);
}
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<package format='2'>
<name>hpp-python</name>
<version>7.0.0</version>
<version>8.0.0</version>
<description>Implement python bindings for HPP </description>

<maintainer email='[email protected]'>Joseph Mirabel</maintainer>
Expand Down