From dc17bf78f74ce78d43e186c0da1a91e5a5845d58 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 28 Jun 2024 13:11:38 +0200 Subject: [PATCH 01/10] sync submodule --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 657b07c..2bea127 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 657b07cb721ecbc383d4e76438eb6ec5c421a332 +Subproject commit 2bea127e8113a32f216ae7a7201e36a6e7c56cc2 From 6e53cb21d90bf9383eed9206ececfc4e4a143f1b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 28 Jun 2024 13:11:40 +0200 Subject: [PATCH 02/10] pre-commit autoupdate --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e2e9834..4d3c449 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_branch: devel repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.8 + rev: v0.5.0 hooks: - id: ruff args: @@ -19,7 +19,7 @@ repos: - id: toml-sort-fix exclude: poetry.lock - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.6 + rev: v18.1.7 hooks: - id: clang-format args: From cd10199f87a1e1a3aab8139479c364e0199c661f Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 28 Jun 2024 14:00:28 +0200 Subject: [PATCH 03/10] nix: initialize flake-parts --- flake.lock | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 49 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..5ac9fdc --- /dev/null +++ b/flake.lock @@ -0,0 +1,58 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1719575122, + "narHash": "sha256-1x3SNH6GtWgpHmhxO4pCz6nidxjCAheF0FpSXSjqRrg=", + "owner": "nim65s", + "repo": "nixpkgs", + "rev": "5206f72d0fadec6f15e6130a86c0695ceb5ec92d", + "type": "github" + }, + "original": { + "owner": "nim65s", + "ref": "gepetto", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..94c479c --- /dev/null +++ b/flake.nix @@ -0,0 +1,49 @@ +{ + description = "Description for the project"; + + inputs = { + flake-parts.url = "github:hercules-ci/flake-parts"; + nixpkgs.url = "github:nim65s/nixpkgs/gepetto"; + }; + + outputs = + inputs@{ flake-parts, ... }: + flake-parts.lib.mkFlake { inherit inputs; } { + imports = [ + # To import a flake module + # 1. Add foo to inputs + # 2. Add foo as a parameter to the outputs function + # 3. Add here: foo.flakeModule + + ]; + systems = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + perSystem = + { + config, + self', + inputs', + pkgs, + system, + ... + }: + { + # Per-system attributes can be defined here. The self' and inputs' + # module parameters provide easy access to attributes of the same + # system. + + # Equivalent to inputs'.nixpkgs.legacyPackages.hello; + packages.default = pkgs.hello; + }; + flake = { + # The usual flake attributes can be defined here, including system- + # agnostic ones like nixosModule and system-enumerating ones, although + # those are more easily expressed in perSystem. + + }; + }; +} From ecfa7d084a4d79edad03eaf2b9a5b688ea60af4b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 30 Jun 2024 12:35:59 +0200 Subject: [PATCH 04/10] nix: package --- default.nix | 52 +++++ flake.lock | 654 ++++++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 46 ++-- 3 files changed, 713 insertions(+), 39 deletions(-) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..4667405 --- /dev/null +++ b/default.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + cmake, + gepetto-viewer-corba, + hpp-manipulation-corba, + pkg-config, + libsForQt5, +}: + +stdenv.mkDerivation { + pname = "hpp-plot"; + version = "5.0.0"; + + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./bin + ./cmake_modules + ./CMakeLists.txt + ./doc + ./include + ./package.xml + ./plugins + ./src + ]; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + pkg-config + ]; + buildInputs = [ + libsForQt5.qtbase + ]; + propagatedBuildInputs = [ + gepetto-viewer-corba + hpp-manipulation-corba + ]; + + doCheck = true; + + meta = { + description = "Graphical utilities for constraint graphs in hpp-manipulation"; + homepage = "https://github.com/humanoid-path-planner/hpp-plot"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.nim65s ]; + }; +} diff --git a/flake.lock b/flake.lock index 5ac9fdc..f741cb3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1717285511, @@ -18,13 +20,644 @@ "type": "github" } }, + "hpp-constraints": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "flake-parts" + ], + "hpp-pinocchio": "hpp-pinocchio", + "hpp-statistics": "hpp-statistics", + "hpp-util": "hpp-util", + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719584695, + "narHash": "sha256-8K94IgUt8kpdRDASnstfX14cBQN4ZK6+LmvOuq6Sg0I=", + "owner": "humanoid-path-planner", + "repo": "hpp-constraints", + "rev": "acd1c62fdfcdb329fd0dea19ae2f18e471e3ef08", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-constraints", + "type": "github" + } + }, + "hpp-constraints_2": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "flake-parts" + ], + "hpp-pinocchio": "hpp-pinocchio_2", + "hpp-statistics": "hpp-statistics_2", + "hpp-util": "hpp-util_3", + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719584695, + "narHash": "sha256-8K94IgUt8kpdRDASnstfX14cBQN4ZK6+LmvOuq6Sg0I=", + "owner": "humanoid-path-planner", + "repo": "hpp-constraints", + "rev": "acd1c62fdfcdb329fd0dea19ae2f18e471e3ef08", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-constraints", + "type": "github" + } + }, + "hpp-corbaserver": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "flake-parts" + ], + "hpp-core": "hpp-core", + "hpp-template-corba": "hpp-template-corba", + "hpp-util": "hpp-util_2", + "nixpkgs": [ + "hpp-manipulation-corba", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719670731, + "narHash": "sha256-1EKv+2sWT3XNrqI+YhJwxrE0Zq77D9k96vnhYJl4KX4=", + "owner": "humanoid-path-planner", + "repo": "hpp-corbaserver", + "rev": "ab24564c4165f51017bf00c84dc8c16c239ba1fe", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-corbaserver", + "type": "github" + } + }, + "hpp-core": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "flake-parts" + ], + "hpp-constraints": "hpp-constraints", + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719586831, + "narHash": "sha256-oRFZsERQKzaW2NvgcKcxqJZtqtlk7rqDK2inhUTABiQ=", + "owner": "humanoid-path-planner", + "repo": "hpp-core", + "rev": "733f884a03cde41aeae18758a26b28cf6fdf02fa", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-core", + "type": "github" + } + }, + "hpp-core_2": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "flake-parts" + ], + "hpp-constraints": "hpp-constraints_2", + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719586831, + "narHash": "sha256-oRFZsERQKzaW2NvgcKcxqJZtqtlk7rqDK2inhUTABiQ=", + "owner": "humanoid-path-planner", + "repo": "hpp-core", + "rev": "733f884a03cde41aeae18758a26b28cf6fdf02fa", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-core", + "type": "github" + } + }, + "hpp-environments": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "hpp-pinocchio", + "flake-parts" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "hpp-pinocchio", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719580427, + "narHash": "sha256-T76zgTJrGm7maKBPwgX+FgQ7MPN7NoLvdZvzARPo9V0=", + "owner": "humanoid-path-planner", + "repo": "hpp-environments", + "rev": "1c727bcc85145a1f5236357fa73df5a183a31f04", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-environments", + "type": "github" + } + }, + "hpp-environments_2": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "hpp-pinocchio", + "flake-parts" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "hpp-pinocchio", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719580427, + "narHash": "sha256-T76zgTJrGm7maKBPwgX+FgQ7MPN7NoLvdZvzARPo9V0=", + "owner": "humanoid-path-planner", + "repo": "hpp-environments", + "rev": "1c727bcc85145a1f5236357fa73df5a183a31f04", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-environments", + "type": "github" + } + }, + "hpp-manipulation": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "flake-parts" + ], + "hpp-core": "hpp-core_2", + "hpp-universal-robot": "hpp-universal-robot", + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719740235, + "narHash": "sha256-+Hh4mck3oz1Xr6JXe8yjDD0tvtVW2allIBl8I2LKm0w=", + "owner": "humanoid-path-planner", + "repo": "hpp-manipulation", + "rev": "770860668e3504dd8b039aa0518e6b50ac3936da", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-manipulation", + "type": "github" + } + }, + "hpp-manipulation-corba": { + "inputs": { + "flake-parts": [ + "flake-parts" + ], + "hpp-corbaserver": "hpp-corbaserver", + "hpp-manipulation-urdf": "hpp-manipulation-urdf", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719743275, + "narHash": "sha256-aXA76GDU9xfb3W8aa0eI/LTtkvG4ydmbd7LCBYBXyyQ=", + "owner": "humanoid-path-planner", + "repo": "hpp-manipulation-corba", + "rev": "5146ecf3f3970717441eea178dcfa49a69673514", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-manipulation-corba", + "type": "github" + } + }, + "hpp-manipulation-urdf": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "flake-parts" + ], + "hpp-manipulation": "hpp-manipulation", + "nixpkgs": [ + "hpp-manipulation-corba", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719741779, + "narHash": "sha256-8tO8rElefStu4Hmbn4TqB3ZCSkVjQBk8ww7zKcbkNIc=", + "owner": "humanoid-path-planner", + "repo": "hpp-manipulation-urdf", + "rev": "ab664c2cdf43b7816cf35ee422cc8da3b0da148b", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-manipulation-urdf", + "type": "github" + } + }, + "hpp-pinocchio": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "flake-parts" + ], + "hpp-environments": "hpp-environments", + "hpp-util": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "hpp-util" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719582071, + "narHash": "sha256-sRWf973UZIdyrS0fhd+vXdTucR9d7Eks9yU85kcFxfo=", + "owner": "humanoid-path-planner", + "repo": "hpp-pinocchio", + "rev": "4ec6186223ce18f4c48605421a7ef583fe827352", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-pinocchio", + "type": "github" + } + }, + "hpp-pinocchio_2": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "flake-parts" + ], + "hpp-environments": "hpp-environments_2", + "hpp-util": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "hpp-util" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719582071, + "narHash": "sha256-sRWf973UZIdyrS0fhd+vXdTucR9d7Eks9yU85kcFxfo=", + "owner": "humanoid-path-planner", + "repo": "hpp-pinocchio", + "rev": "4ec6186223ce18f4c48605421a7ef583fe827352", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-pinocchio", + "type": "github" + } + }, + "hpp-statistics": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "flake-parts" + ], + "hpp-util": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "hpp-util" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719582334, + "narHash": "sha256-bzGI7z6hTGkuNs71Vcb3vsVpey1SuR7Okx4rJU1LHFs=", + "owner": "humanoid-path-planner", + "repo": "hpp-statistics", + "rev": "613b1f9c2788cb33097c1f1c0e4216420665a1e0", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-statistics", + "type": "github" + } + }, + "hpp-statistics_2": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "flake-parts" + ], + "hpp-util": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "hpp-util" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719582334, + "narHash": "sha256-bzGI7z6hTGkuNs71Vcb3vsVpey1SuR7Okx4rJU1LHFs=", + "owner": "humanoid-path-planner", + "repo": "hpp-statistics", + "rev": "613b1f9c2788cb33097c1f1c0e4216420665a1e0", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-statistics", + "type": "github" + } + }, + "hpp-template-corba": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "flake-parts" + ], + "hpp-util": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-util" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719587477, + "narHash": "sha256-bUGCrWnAuEqmhD7sunx+L6yqukHueDs99MbHM7M5/8A=", + "owner": "humanoid-path-planner", + "repo": "hpp-template-corba", + "rev": "e5512a9505df6bc9ae317d51e3e14cdc27d6583e", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-template-corba", + "type": "github" + } + }, + "hpp-universal-robot": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "flake-parts" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719670288, + "narHash": "sha256-9gi96DhSqvAHlXUlTs6O7TG/3dTthL2LETHb1rqP75A=", + "owner": "humanoid-path-planner", + "repo": "hpp-universal-robot", + "rev": "d9308abb98b864da8ab1041f66f6c78aef2e8d53", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-universal-robot", + "type": "github" + } + }, + "hpp-util": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "flake-parts" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719580825, + "narHash": "sha256-trfl8A+P7a1gnACnTXNK98TYWWDAOM3PKfkXxpC3X/8=", + "owner": "humanoid-path-planner", + "repo": "hpp-util", + "rev": "0504f15818a92c7a257cd6b60cd8b6092bd6dbfa", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-util", + "type": "github" + } + }, + "hpp-util_2": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "flake-parts" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-corbaserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719580825, + "narHash": "sha256-trfl8A+P7a1gnACnTXNK98TYWWDAOM3PKfkXxpC3X/8=", + "owner": "humanoid-path-planner", + "repo": "hpp-util", + "rev": "0504f15818a92c7a257cd6b60cd8b6092bd6dbfa", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-util", + "type": "github" + } + }, + "hpp-util_3": { + "inputs": { + "flake-parts": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "flake-parts" + ], + "nixpkgs": [ + "hpp-manipulation-corba", + "hpp-manipulation-urdf", + "hpp-manipulation", + "hpp-core", + "hpp-constraints", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719580825, + "narHash": "sha256-trfl8A+P7a1gnACnTXNK98TYWWDAOM3PKfkXxpC3X/8=", + "owner": "humanoid-path-planner", + "repo": "hpp-util", + "rev": "0504f15818a92c7a257cd6b60cd8b6092bd6dbfa", + "type": "github" + }, + "original": { + "owner": "humanoid-path-planner", + "ref": "release/5.1.0", + "repo": "hpp-util", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1719575122, - "narHash": "sha256-1x3SNH6GtWgpHmhxO4pCz6nidxjCAheF0FpSXSjqRrg=", + "lastModified": 1719674427, + "narHash": "sha256-z2hCpVyfnmYTA5iabf1SW4peFV9itE1JJcXNBKIFkDg=", "owner": "nim65s", "repo": "nixpkgs", - "rev": "5206f72d0fadec6f15e6130a86c0695ceb5ec92d", + "rev": "b81610d293fac26c2ec6a81718a979bc25f8c155", "type": "github" }, "original": { @@ -34,21 +667,10 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", + "hpp-manipulation-corba": "hpp-manipulation-corba", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 94c479c..99e7359 100644 --- a/flake.nix +++ b/flake.nix @@ -1,21 +1,28 @@ { - description = "Description for the project"; + description = "Graphical utilities for constraint graphs in hpp-manipulation"; + + nixConfig = { + extra-substituters = [ "https://gepetto.cachix.org" ]; + extra-trusted-public-keys = [ "gepetto.cachix.org-1:toswMl31VewC0jGkN6+gOelO2Yom0SOHzPwJMY2XiDY=" ]; + }; inputs = { - flake-parts.url = "github:hercules-ci/flake-parts"; nixpkgs.url = "github:nim65s/nixpkgs/gepetto"; + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; + hpp-manipulation-corba = { + url = "github:humanoid-path-planner/hpp-manipulation-corba/release/5.1.0"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + }; }; outputs = inputs@{ flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { - imports = [ - # To import a flake module - # 1. Add foo to inputs - # 2. Add foo as a parameter to the outputs function - # 3. Add here: foo.flakeModule - - ]; + imports = [ ]; systems = [ "x86_64-linux" "aarch64-linux" @@ -24,26 +31,19 @@ ]; perSystem = { - config, self', - inputs', pkgs, system, ... }: { - # Per-system attributes can be defined here. The self' and inputs' - # module parameters provide easy access to attributes of the same - # system. - - # Equivalent to inputs'.nixpkgs.legacyPackages.hello; - packages.default = pkgs.hello; + packages = { + inherit (pkgs) cachix; + default = pkgs.callPackage ./. { + hpp-manipulation-corba = inputs.hpp-manipulation-corba.packages.${system}.default; + }; + }; + devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; }; }; - flake = { - # The usual flake attributes can be defined here, including system- - # agnostic ones like nixosModule and system-enumerating ones, although - # those are more easily expressed in perSystem. - - }; }; } From a50fcb66ed300bb934675120604776d274ccb7b9 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 30 Jun 2024 12:36:07 +0200 Subject: [PATCH 05/10] nix: ci --- .github/workflows/nix.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/nix.yml diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml new file mode 100644 index 0000000..1ac391b --- /dev/null +++ b/.github/workflows/nix.yml @@ -0,0 +1,19 @@ +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) + env: + CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} From 400e9544d9b981b4786e5e5042eea8c1e47d8285 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 30 Jun 2024 12:36:18 +0200 Subject: [PATCH 06/10] format --- default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 4667405..35763a7 100644 --- a/default.nix +++ b/default.nix @@ -33,9 +33,7 @@ stdenv.mkDerivation { libsForQt5.wrapQtAppsHook pkg-config ]; - buildInputs = [ - libsForQt5.qtbase - ]; + buildInputs = [ libsForQt5.qtbase ]; propagatedBuildInputs = [ gepetto-viewer-corba hpp-manipulation-corba From 6d00d375ff72b25b04054308f8bf45bee9c74ce8 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 30 Jun 2024 20:46:29 +0200 Subject: [PATCH 07/10] release: Update package.xml version to 5.1.0 --- package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.xml b/package.xml index f6c1baa..9232d97 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ hpp-plot - 5.0.0 + 5.1.0 Plotting tools for HPP Joseph Mirabel From a759e24befcf86641b590387604b4125a68adeea Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 2 Jul 2024 11:14:28 +0200 Subject: [PATCH 08/10] nix: update after v5.1.0 --- flake.lock | 270 +++++------------------------------------------------ flake.nix | 2 +- 2 files changed, 24 insertions(+), 248 deletions(-) diff --git a/flake.lock b/flake.lock index f741cb3..051cd1a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -24,7 +24,8 @@ "inputs": { "flake-parts": [ "hpp-manipulation-corba", - "hpp-corbaserver", + "hpp-manipulation-urdf", + "hpp-manipulation", "hpp-core", "flake-parts" ], @@ -33,7 +34,8 @@ "hpp-util": "hpp-util", "nixpkgs": [ "hpp-manipulation-corba", - "hpp-corbaserver", + "hpp-manipulation-urdf", + "hpp-manipulation", "hpp-core", "nixpkgs" ] @@ -53,50 +55,27 @@ "type": "github" } }, - "hpp-constraints_2": { + "hpp-corbaserver": { "inputs": { "flake-parts": [ + "hpp-manipulation-corba", + "flake-parts" + ], + "hpp-core": [ "hpp-manipulation-corba", "hpp-manipulation-urdf", "hpp-manipulation", - "hpp-core", - "flake-parts" + "hpp-core" ], - "hpp-pinocchio": "hpp-pinocchio_2", - "hpp-statistics": "hpp-statistics_2", - "hpp-util": "hpp-util_3", - "nixpkgs": [ + "hpp-template-corba": "hpp-template-corba", + "hpp-util": [ "hpp-manipulation-corba", "hpp-manipulation-urdf", "hpp-manipulation", "hpp-core", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719584695, - "narHash": "sha256-8K94IgUt8kpdRDASnstfX14cBQN4ZK6+LmvOuq6Sg0I=", - "owner": "humanoid-path-planner", - "repo": "hpp-constraints", - "rev": "acd1c62fdfcdb329fd0dea19ae2f18e471e3ef08", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-constraints", - "type": "github" - } - }, - "hpp-corbaserver": { - "inputs": { - "flake-parts": [ - "hpp-manipulation-corba", - "flake-parts" + "hpp-constraints", + "hpp-util" ], - "hpp-core": "hpp-core", - "hpp-template-corba": "hpp-template-corba", - "hpp-util": "hpp-util_2", "nixpkgs": [ "hpp-manipulation-corba", "nixpkgs" @@ -118,35 +97,6 @@ } }, "hpp-core": { - "inputs": { - "flake-parts": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "flake-parts" - ], - "hpp-constraints": "hpp-constraints", - "nixpkgs": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719586831, - "narHash": "sha256-oRFZsERQKzaW2NvgcKcxqJZtqtlk7rqDK2inhUTABiQ=", - "owner": "humanoid-path-planner", - "repo": "hpp-core", - "rev": "733f884a03cde41aeae18758a26b28cf6fdf02fa", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-core", - "type": "github" - } - }, - "hpp-core_2": { "inputs": { "flake-parts": [ "hpp-manipulation-corba", @@ -154,7 +104,7 @@ "hpp-manipulation", "flake-parts" ], - "hpp-constraints": "hpp-constraints_2", + "hpp-constraints": "hpp-constraints", "nixpkgs": [ "hpp-manipulation-corba", "hpp-manipulation-urdf", @@ -178,40 +128,6 @@ } }, "hpp-environments": { - "inputs": { - "flake-parts": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "hpp-pinocchio", - "flake-parts" - ], - "nixpkgs": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "hpp-pinocchio", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719580427, - "narHash": "sha256-T76zgTJrGm7maKBPwgX+FgQ7MPN7NoLvdZvzARPo9V0=", - "owner": "humanoid-path-planner", - "repo": "hpp-environments", - "rev": "1c727bcc85145a1f5236357fa73df5a183a31f04", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-environments", - "type": "github" - } - }, - "hpp-environments_2": { "inputs": { "flake-parts": [ "hpp-manipulation-corba", @@ -254,7 +170,7 @@ "hpp-manipulation-urdf", "flake-parts" ], - "hpp-core": "hpp-core_2", + "hpp-core": "hpp-core", "hpp-universal-robot": "hpp-universal-robot", "nixpkgs": [ "hpp-manipulation-corba", @@ -289,16 +205,15 @@ ] }, "locked": { - "lastModified": 1719743275, - "narHash": "sha256-aXA76GDU9xfb3W8aa0eI/LTtkvG4ydmbd7LCBYBXyyQ=", + "lastModified": 1719773112, + "narHash": "sha256-QTD+aXURL+dCG3ZbFH4Q2X6TQhOP8sq11xkWtKCM5EU=", "owner": "humanoid-path-planner", "repo": "hpp-manipulation-corba", - "rev": "5146ecf3f3970717441eea178dcfa49a69673514", + "rev": "2095617a8d31310c4d5b6b9fb7ff30311f9af16e", "type": "github" }, "original": { "owner": "humanoid-path-planner", - "ref": "release/5.1.0", "repo": "hpp-manipulation-corba", "type": "github" } @@ -331,46 +246,6 @@ } }, "hpp-pinocchio": { - "inputs": { - "flake-parts": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "flake-parts" - ], - "hpp-environments": "hpp-environments", - "hpp-util": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "hpp-util" - ], - "nixpkgs": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719582071, - "narHash": "sha256-sRWf973UZIdyrS0fhd+vXdTucR9d7Eks9yU85kcFxfo=", - "owner": "humanoid-path-planner", - "repo": "hpp-pinocchio", - "rev": "4ec6186223ce18f4c48605421a7ef583fe827352", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-pinocchio", - "type": "github" - } - }, - "hpp-pinocchio_2": { "inputs": { "flake-parts": [ "hpp-manipulation-corba", @@ -380,7 +255,7 @@ "hpp-constraints", "flake-parts" ], - "hpp-environments": "hpp-environments_2", + "hpp-environments": "hpp-environments", "hpp-util": [ "hpp-manipulation-corba", "hpp-manipulation-urdf", @@ -414,45 +289,6 @@ } }, "hpp-statistics": { - "inputs": { - "flake-parts": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "flake-parts" - ], - "hpp-util": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "hpp-util" - ], - "nixpkgs": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719582334, - "narHash": "sha256-bzGI7z6hTGkuNs71Vcb3vsVpey1SuR7Okx4rJU1LHFs=", - "owner": "humanoid-path-planner", - "repo": "hpp-statistics", - "rev": "613b1f9c2788cb33097c1f1c0e4216420665a1e0", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-statistics", - "type": "github" - } - }, - "hpp-statistics_2": { "inputs": { "flake-parts": [ "hpp-manipulation-corba", @@ -558,66 +394,6 @@ } }, "hpp-util": { - "inputs": { - "flake-parts": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "flake-parts" - ], - "nixpkgs": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719580825, - "narHash": "sha256-trfl8A+P7a1gnACnTXNK98TYWWDAOM3PKfkXxpC3X/8=", - "owner": "humanoid-path-planner", - "repo": "hpp-util", - "rev": "0504f15818a92c7a257cd6b60cd8b6092bd6dbfa", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-util", - "type": "github" - } - }, - "hpp-util_2": { - "inputs": { - "flake-parts": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "flake-parts" - ], - "nixpkgs": [ - "hpp-manipulation-corba", - "hpp-corbaserver", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719580825, - "narHash": "sha256-trfl8A+P7a1gnACnTXNK98TYWWDAOM3PKfkXxpC3X/8=", - "owner": "humanoid-path-planner", - "repo": "hpp-util", - "rev": "0504f15818a92c7a257cd6b60cd8b6092bd6dbfa", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-util", - "type": "github" - } - }, - "hpp-util_3": { "inputs": { "flake-parts": [ "hpp-manipulation-corba", diff --git a/flake.nix b/flake.nix index 99e7359..b42ff58 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; hpp-manipulation-corba = { - url = "github:humanoid-path-planner/hpp-manipulation-corba/release/5.1.0"; + url = "github:humanoid-path-planner/hpp-manipulation-corba"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; From 724ec5bbe0684f7a198ad6c9ce49690cba700369 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 2 Jul 2024 11:52:01 +0200 Subject: [PATCH 09/10] nix ci: cachix only on HPP org --- .github/workflows/nix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 1ac391b..9488350 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -15,5 +15,6 @@ jobs: - 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 }} From 9c6727e0325b6ef215db14e0afa2114ae07710ff Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 4 Jul 2024 13:45:13 +0200 Subject: [PATCH 10/10] pre-commit autoupdate --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4d3c449..8d2133d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: toml-sort-fix exclude: poetry.lock - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.7 + rev: v18.1.8 hooks: - id: clang-format args: