From 35847739da09fd98f8cff88b9049192199748bf0 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 28 Jun 2024 13:11:00 +0200 Subject: [PATCH 1/9] 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 15cf7c8d10557e647c878f963d07e5c2c3bd2783 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 28 Jun 2024 13:11:02 +0200 Subject: [PATCH 2/9] 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 908310e0ed9e5955dd146121d56566d8f3859d52 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 28 Jun 2024 14:00:19 +0200 Subject: [PATCH 3/9] 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 27d1fdf57fc8199bd4e31062e7a193abdef08f9b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sat, 29 Jun 2024 16:23:13 +0200 Subject: [PATCH 4/9] nix: package --- default.nix | 41 +++++++ flake.lock | 299 +++++++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 43 ++++---- 3 files changed, 344 insertions(+), 39 deletions(-) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..b16c90d --- /dev/null +++ b/default.nix @@ -0,0 +1,41 @@ +{ + lib, + cmake, + hpp-corbaserver, + pkg-config, + python3Packages +}: + +python3Packages.buildPythonPackage { + pname = "hpp-romeo"; + version = "5.0.0"; + pyproject = false; + + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./CMakeLists.txt + ./doc + ./launch + ./package.xml + ./rviz + ./scripts + ./src + ]; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + propagatedBuildInputs = [ hpp-corbaserver ]; + + meta = { + description = "Python and ros launch files for Romeo robot in hpp"; + homepage = "https://github.com/humanoid-path-planner/hpp_romeo"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.nim65s ]; + }; +} diff --git a/flake.lock b/flake.lock index 5ac9fdc..fb3a34d 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,289 @@ "type": "github" } }, + "hpp-constraints": { + "inputs": { + "flake-parts": [ + "hpp-corbaserver", + "hpp-core", + "flake-parts" + ], + "hpp-pinocchio": "hpp-pinocchio", + "hpp-statistics": "hpp-statistics", + "hpp-util": "hpp-util", + "nixpkgs": [ + "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-corbaserver": { + "inputs": { + "flake-parts": [ + "flake-parts" + ], + "hpp-core": "hpp-core", + "hpp-template-corba": "hpp-template-corba", + "hpp-util": "hpp-util_2", + "nixpkgs": [ + "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-corbaserver", + "flake-parts" + ], + "hpp-constraints": "hpp-constraints", + "nixpkgs": [ + "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-environments": { + "inputs": { + "flake-parts": [ + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "hpp-pinocchio", + "flake-parts" + ], + "nixpkgs": [ + "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-pinocchio": { + "inputs": { + "flake-parts": [ + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "flake-parts" + ], + "hpp-environments": "hpp-environments", + "hpp-util": [ + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "hpp-util" + ], + "nixpkgs": [ + "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-statistics": { + "inputs": { + "flake-parts": [ + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "flake-parts" + ], + "hpp-util": [ + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "hpp-util" + ], + "nixpkgs": [ + "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-template-corba": { + "inputs": { + "flake-parts": [ + "hpp-corbaserver", + "flake-parts" + ], + "hpp-util": [ + "hpp-corbaserver", + "hpp-util" + ], + "nixpkgs": [ + "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-util": { + "inputs": { + "flake-parts": [ + "hpp-corbaserver", + "hpp-core", + "hpp-constraints", + "flake-parts" + ], + "nixpkgs": [ + "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-corbaserver", + "flake-parts" + ], + "nixpkgs": [ + "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" + } + }, "nixpkgs": { "locked": { - "lastModified": 1719575122, - "narHash": "sha256-1x3SNH6GtWgpHmhxO4pCz6nidxjCAheF0FpSXSjqRrg=", + "lastModified": 1719585538, + "narHash": "sha256-AGXFOkdQb3rOh0aRqY52Z6ObRhWmAoFXrbYZHHqhX5A=", "owner": "nim65s", "repo": "nixpkgs", - "rev": "5206f72d0fadec6f15e6130a86c0695ceb5ec92d", + "rev": "e3d93c526fe07a2c58ab1f8bec4ea77054f78062", "type": "github" }, "original": { @@ -34,21 +312,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-corbaserver": "hpp-corbaserver", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 94c479c..a0305b8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,21 +1,28 @@ { - description = "Description for the project"; + description = "Python and ros launch files for Romeo robot in hpp"; + + 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-corbaserver = { + url = "github:humanoid-path-planner/hpp-corbaserver/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,16 @@ ]; 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.default = pkgs.callPackage ./. { + hpp-corbaserver = inputs.hpp-corbaserver.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 43a7bb59ca939d158081a2910197bdc216e114ab Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sat, 29 Jun 2024 16:33:05 +0200 Subject: [PATCH 5/9] nix: ci --- .github/workflows/nix.yml | 20 ++++++++++++++++++++ 1 file changed, 20 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..d86192c --- /dev/null +++ b/.github/workflows/nix.yml @@ -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 + with: + extra-conf: | + trusted-substituters = https://gepetto.cachix.org + trusted-public-keys = gepetto.cachix.org-1:toswMl31VewC0jGkN6+gOelO2Yom0SOHzPwJMY2XiDY= + - uses: DeterminateSystems/magic-nix-cache-action@main + - run: nix build --accept-flake-config From cac79f722c8efb4842717286f59881daee2961f9 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 30 Jun 2024 13:40:05 +0200 Subject: [PATCH 6/9] nix ci: cachix push --- .github/workflows/nix.yml | 9 ++++----- default.nix | 2 +- flake.nix | 7 +++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index d86192c..1ac391b 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -12,9 +12,8 @@ jobs: steps: - uses: actions/checkout@v4 - uses: DeterminateSystems/nix-installer-action@main - with: - extra-conf: | - trusted-substituters = https://gepetto.cachix.org - trusted-public-keys = gepetto.cachix.org-1:toswMl31VewC0jGkN6+gOelO2Yom0SOHzPwJMY2XiDY= - uses: DeterminateSystems/magic-nix-cache-action@main - - run: nix build --accept-flake-config + - 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 }} diff --git a/default.nix b/default.nix index b16c90d..9fa4d1a 100644 --- a/default.nix +++ b/default.nix @@ -3,7 +3,7 @@ cmake, hpp-corbaserver, pkg-config, - python3Packages + python3Packages, }: python3Packages.buildPythonPackage { diff --git a/flake.nix b/flake.nix index a0305b8..25d415d 100644 --- a/flake.nix +++ b/flake.nix @@ -37,8 +37,11 @@ ... }: { - packages.default = pkgs.callPackage ./. { - hpp-corbaserver = inputs.hpp-corbaserver.packages.${system}.default; + packages = { + inherit (pkgs) cachix; + default = pkgs.callPackage ./. { + hpp-corbaserver = inputs.hpp-corbaserver.packages.${system}.default; + }; }; devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; }; }; From 245ea796f03fa64fa30c918736384a1642865da2 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 30 Jun 2024 20:41:04 +0200 Subject: [PATCH 7/9] 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 edbd66f..4cf37d8 100644 --- a/package.xml +++ b/package.xml @@ -1,6 +1,6 @@ hpp_romeo - 5.0.0 + 5.1.0 Python and ros launch files for Romeo robot in hpp. From c7545101b7c99c59902603c0e3f246bd54ab4f7e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 2 Jul 2024 11:14:37 +0200 Subject: [PATCH 8/9] nix: update after v5.1.0 --- flake.lock | 48 +++++++++++------------------------------------- flake.nix | 2 +- 2 files changed, 12 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index fb3a34d..5ab78aa 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": { @@ -58,22 +58,20 @@ ], "hpp-core": "hpp-core", "hpp-template-corba": "hpp-template-corba", - "hpp-util": "hpp-util_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1719670731, - "narHash": "sha256-1EKv+2sWT3XNrqI+YhJwxrE0Zq77D9k96vnhYJl4KX4=", + "lastModified": 1719772432, + "narHash": "sha256-qFcBT/YDTsrAzEE//JmCbk1TnVrnYcme1WCzkPaXwZ0=", "owner": "humanoid-path-planner", "repo": "hpp-corbaserver", - "rev": "ab24564c4165f51017bf00c84dc8c16c239ba1fe", + "rev": "f623d8cd51e627a12e7c6f240781dd7f4a5b7ddf", "type": "github" }, "original": { "owner": "humanoid-path-planner", - "ref": "release/5.1.0", "repo": "hpp-corbaserver", "type": "github" } @@ -218,6 +216,8 @@ ], "hpp-util": [ "hpp-corbaserver", + "hpp-core", + "hpp-constraints", "hpp-util" ], "nixpkgs": [ @@ -270,39 +270,13 @@ "type": "github" } }, - "hpp-util_2": { - "inputs": { - "flake-parts": [ - "hpp-corbaserver", - "flake-parts" - ], - "nixpkgs": [ - "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" - } - }, "nixpkgs": { "locked": { - "lastModified": 1719585538, - "narHash": "sha256-AGXFOkdQb3rOh0aRqY52Z6ObRhWmAoFXrbYZHHqhX5A=", + "lastModified": 1719674427, + "narHash": "sha256-z2hCpVyfnmYTA5iabf1SW4peFV9itE1JJcXNBKIFkDg=", "owner": "nim65s", "repo": "nixpkgs", - "rev": "e3d93c526fe07a2c58ab1f8bec4ea77054f78062", + "rev": "b81610d293fac26c2ec6a81718a979bc25f8c155", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 25d415d..1a899fe 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; hpp-corbaserver = { - url = "github:humanoid-path-planner/hpp-corbaserver/release/5.1.0"; + url = "github:humanoid-path-planner/hpp-corbaserver"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; From 5d5bce5ab5423d0bc7aaf5e7babde2ded447cefa Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 2 Jul 2024 11:52:05 +0200 Subject: [PATCH 9/9] 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 }}