diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 4fd6a01..37bfd46 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -14,6 +14,7 @@ jobs: nix: runs-on: "${{ matrix.os }}-latest" strategy: + fail-fast: false matrix: os: [ubuntu] steps: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2a95010..7dd0581 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 @@ -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: diff --git a/flake.lock b/flake.lock index 55b1809..9e8a37b 100644 --- a/flake.lock +++ b/flake.lock @@ -97,11 +97,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775253014, - "narHash": "sha256-FkBoiFcTxu4I4QYBV731G30zfEpowFHaQla95mpgBqY=", + "lastModified": 1776113076, + "narHash": "sha256-rQp/6mgQc4szevay50RbGXOXwL3xC7oHktywFPrmbAM=", "owner": "gepetto", "repo": "flakoboros", - "rev": "f01c99b0c3e2e75de484bd350353d4f7383385c2", + "rev": "07a89fe2a47f2f0364e795cf3e69c045de14a3b2", "type": "github" }, "original": { @@ -148,11 +148,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1775341473, - "narHash": "sha256-RiWQZm+fm+GyWREPrcbzBc17z9MdllzhxI6WvIYu6cY=", + "lastModified": 1776113232, + "narHash": "sha256-VtzAiez4xLmUY/TrQ31ECKjnOFDrnorQcu6WfsAF2nk=", "owner": "gepetto", "repo": "gazebros2nix", - "rev": "873b616afa62f305911880c0b39ebd9df1a86947", + "rev": "43783392a112e894b857bdb56ede7044437069f4", "type": "github" }, "original": { @@ -199,11 +199,11 @@ ] }, "locked": { - "lastModified": 1775485998, - "narHash": "sha256-Ugr5APRRS5QCkZ2cMjo245twxkvEETSpGRzU2yOJuDw=", + "lastModified": 1776351070, + "narHash": "sha256-sHbumFcaksKKksN+ZkUeS64llNG+kXkHC6sPk00gjQw=", "owner": "gepetto", "repo": "nix", - "rev": "6066d58fde101284223efb1fb83057ac0e4e8b5c", + "rev": "fc10d1772e120e1a4cdf1666e983125ecfd3a6ea", "type": "github" }, "original": { @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1775077333, - "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -275,60 +275,31 @@ ] }, "locked": { - "lastModified": 1775490126, - "narHash": "sha256-avBPV0xiJD6p8K/TwnJNxvFjo1wkFjzI9by1PCVt/DI=", + "lastModified": 1776407163, + "narHash": "sha256-9dy/cZjjdt7oNjiPPKiN5im82zqdkWfEMIyz07tY+2U=", "owner": "humanoid-path-planner", "repo": "hpp-core", - "rev": "62de907f7185febfa11dd955c62a0f679bf3f65f", + "rev": "d15d7ef530d54bbfccc51d231124b20f3410378a", "type": "github" }, "original": { "owner": "humanoid-path-planner", + "ref": "pull/434/head", "repo": "hpp-core", "type": "github" } }, - "hpp-manipulation": { - "inputs": { - "flake-parts": [ - "hpp-manipulation", - "gepetto", - "flake-parts" - ], - "gepetto": [ - "gepetto" - ], - "systems": [ - "hpp-manipulation", - "gepetto", - "systems" - ] - }, - "locked": { - "lastModified": 1775604707, - "narHash": "sha256-n0ryLQJZ+1hygN4FgwzKYP/xjHwudOAqfNj2FEuXAAk=", - "owner": "humanoid-path-planner", - "repo": "hpp-manipulation", - "rev": "dc0f8290333ed9ccfead9427d52db7084d54064e", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "repo": "hpp-manipulation", - "type": "github" - } - }, "nix-ros-overlay": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1775242455, - "narHash": "sha256-6k6GChuNuVU70rq5Stp7PHsH1haAX7q4uRv6hBwGMoc=", + "lastModified": 1775764892, + "narHash": "sha256-l1UbHppd5KaU4K/TQPIXf9wnVifH4Tgrx5z2GFoq/bw=", "owner": "lopsided98", "repo": "nix-ros-overlay", - "rev": "909dbfd8cbe571a6cb63ac7a526e71c8d3f85a26", + "rev": "0a4e8cf51001d2d1c613f95dadd3853da42c0164", "type": "github" }, "original": { @@ -461,11 +432,11 @@ ] }, "locked": { - "lastModified": 1775197701, - "narHash": "sha256-W9dcvnvbpZZexKVnDp/8NiNXqy2gnq1FWCD142/Skp8=", + "lastModified": 1775439158, + "narHash": "sha256-NHY9SJNU019n+8NCabBDtmuzRFeE2gZlYKHowp9bV24=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "946e5fb82c3443940c45e5a61686d173e2e21155", + "rev": "fb6b728260f3f32761367e9fd1e1a25b4245bcd0", "type": "github" }, "original": { @@ -476,21 +447,8 @@ }, "root": { "inputs": { - "flake-parts": [ - "gepetto", - "flake-parts" - ], "gepetto": "gepetto", - "hpp-core": "hpp-core", - "hpp-manipulation": "hpp-manipulation", - "systems": [ - "gepetto", - "systems" - ], - "treefmt-nix": [ - "gepetto", - "treefmt-nix" - ] + "hpp-core": "hpp-core" } }, "system-manager": { @@ -503,11 +461,11 @@ "userborn": "userborn" }, "locked": { - "lastModified": 1775069719, - "narHash": "sha256-NO8/XIfx/MVpWPL4KzdezhmdwDLT6B699cS/RkhoVb0=", + "lastModified": 1776108115, + "narHash": "sha256-QDa17vvigUyEAk/kTkDHOBFqmbWIe7aZDCjSgl9BG2c=", "owner": "numtide", "repo": "system-manager", - "rev": "7dced4829576f6e540e2b985b9e47859ac5b8421", + "rev": "e028253c2f1ea1b3eba2ce84ae8f770d823fe4ac", "type": "github" }, "original": { @@ -556,11 +514,11 @@ ] }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -614,11 +572,11 @@ ] }, "locked": { - "lastModified": 1775195476, - "narHash": "sha256-uaPmLBiYfd6dpTJD8SI6+8Cg0ciUpHc5uN5EbFmd6SE=", + "lastModified": 1775706324, + "narHash": "sha256-BTb4sydzX2B5/oNbvCdQFeSbk97xEnbb8bk84CiKCOs=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "7fac30f496a7d9853e8c301a8edbfc35af50d418", + "rev": "5707df99097375896a3dda811d492a2fabe63500", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 30309c5..6c2c5c8 100644 --- a/flake.nix +++ b/flake.nix @@ -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 + ]; + }; + }; } ); } diff --git a/package.xml b/package.xml index ac49125..927fcc0 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ hpp-python - 7.0.0 + 8.0.0 Implement python bindings for HPP Joseph Mirabel