Skip to content

Commit

Permalink
Merge branch 'devel' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Jul 4, 2024
2 parents 05c2298 + a32e4ca commit 32be349
Show file tree
Hide file tree
Showing 8 changed files with 156 additions and 3 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "Nix CI"

on: [pull_request, push]

jobs:
tests:
name: "Nix build on ${{ matrix.os }}"
runs-on: "${{ matrix.os }}-latest"
strategy:
matrix:
os: [ubuntu]
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- run: nix --accept-flake-config build -L
- run: nix --accept-flake-config run .#cachix push gepetto $(readlink result)
if: github.repository_owner == 'humanoid-path-planner'
env:
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
File renamed without changes.
48 changes: 48 additions & 0 deletions default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
lib,
stdenv,
boost,
cmake,
jrl-cmakemodules,
tinyxml-2,
}:

stdenv.mkDerivation {
pname = "hpp-util";
version = "5.0.0";

src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [
./CMakeLists.txt
./doc
./include
./package.xml
./src
./tests
];
};

prePatch = ''
substituteInPlace tests/run_debug.sh.in \
--replace-fail /bin/bash ${stdenv.shell}
'';

strictDeps = true;

nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [
boost
jrl-cmakemodules
tinyxml-2
];

doCheck = true;

meta = {
description = "Debugging tools for the HPP project";
homepage = "https://github.com/humanoid-path-planner/hpp-util";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.nim65s ];
};
}
48 changes: 48 additions & 0 deletions flake.lock

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

37 changes: 37 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
description = "Debugging tools for the HPP project";

nixConfig = {
extra-substituters = [ "https://gepetto.cachix.org" ];
extra-trusted-public-keys = [ "gepetto.cachix.org-1:toswMl31VewC0jGkN6+gOelO2Yom0SOHzPwJMY2XiDY=" ];
};

inputs = {
nixpkgs.url = "github:nim65s/nixpkgs/gepetto";
flake-parts = {
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
};

outputs =
inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
imports = [ ];
systems = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
perSystem =
{ self', pkgs, ... }:
{
packages = {
inherit (pkgs) cachix;
default = pkgs.callPackage ./. { };
};
devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
};
};
}
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-util</name>
<version>5.0.0</version>
<version>5.1.0</version>
<description>Debugging tools for the HPP project. </description>

<maintainer email='[email protected]'>Joseph Mirabel</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies = [
description = "Debugging tools for the HPP project."
license = "BSD-2-Clause"
name = "hpp-util"
version = "5.0.0"
version = "5.1.0"

[tool.ruff]
extend-exclude = ["cmake"]
Expand Down

0 comments on commit 32be349

Please sign in to comment.