From 9c4108b1197e9da8675550653292ba4513a49119 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 17:25:56 +0000
Subject: [PATCH 01/11] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.8 → v0.5.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.8...v0.5.0)
- [github.com/pre-commit/mirrors-clang-format: v18.1.6 → v18.1.8](https://github.com/pre-commit/mirrors-clang-format/compare/v18.1.6...v18.1.8)
---
 .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..8d2133d 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.8
   hooks:
   - id: clang-format
     args:

From fad9e426380588f848643dc9b99d03db5038aa39 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 2 Jul 2024 11:14:45 +0200
Subject: [PATCH 02/11] nix: update after v5.1.0

---
 flake.lock | 19 +++++++++----------
 flake.nix  |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2095685..f9d638d 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": {
@@ -30,27 +30,26 @@
         ]
       },
       "locked": {
-        "lastModified": 1719580825,
-        "narHash": "sha256-trfl8A+P7a1gnACnTXNK98TYWWDAOM3PKfkXxpC3X/8=",
+        "lastModified": 1719769497,
+        "narHash": "sha256-cYONa7WTagNZCITtocdII+WcfdzZnvznFUyb7YLodIw=",
         "owner": "humanoid-path-planner",
         "repo": "hpp-util",
-        "rev": "0504f15818a92c7a257cd6b60cd8b6092bd6dbfa",
+        "rev": "8811dcadeec6b1e52b4cd59da39ad2e170f17ad7",
         "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": {
diff --git a/flake.nix b/flake.nix
index 53db142..9e606b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,7 @@
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
     hpp-util = {
-      url = "github:humanoid-path-planner/hpp-util/release/5.1.0";
+      url = "github:humanoid-path-planner/hpp-util";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-parts.follows = "flake-parts";
     };

From ccc77cdbd7af18b724a07d3d9ce47ef4199512fa Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 2 Jul 2024 11:52:10 +0200
Subject: [PATCH 03/11] 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 3cc67cbaf5860c1e25b42f79ad13b0e4f703c2d4 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 4 Jul 2024 13:36:41 +0200
Subject: [PATCH 04/11] 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:

From 20de3b6e8772e98ef1fc6f3d46e5fdd75ece1255 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 17:14:53 +0000
Subject: [PATCH 05/11] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.5.0 → v0.5.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.0...v0.5.1)
---
 .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 8d2133d..310e95e 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.5.0
+  rev: v0.5.1
   hooks:
   - id: ruff
     args:

From 1f1171023ea905c59136fdd8221d7cf791e7948c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 9 Jul 2024 11:45:28 +0200
Subject: [PATCH 06/11] ci: httpS

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19f5e79..35651d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1 +1 @@
-include: http://rainboard.laas.fr/project/hpp-template-corba/.gitlab-ci.yml
+include: https://rainboard.laas.fr/project/hpp-template-corba/.gitlab-ci.yml

From 93a0932350ca2bfa00b830fae793aae8e98f6661 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:24:44 +0000
Subject: [PATCH 07/11] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.5.1 → v0.5.5](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.1...v0.5.5)
---
 .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 310e95e..263f1be 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.5.1
+  rev: v0.5.5
   hooks:
   - id: ruff
     args:

From f74d77c5f877e49710b71e43322d3191d8d33a8b Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 7 Oct 2024 13:58:11 +0200
Subject: [PATCH 08/11] nix: move package to nixpkgs

---
 .github/workflows/nix.yml | 18 +++++++--------
 default.nix               | 48 ---------------------------------------
 flake.lock                | 35 ++++------------------------
 flake.nix                 | 43 ++++++++++++++++-------------------
 4 files changed, 34 insertions(+), 110 deletions(-)
 delete mode 100644 default.nix

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 9488350..cc47550 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -1,6 +1,7 @@
-name: "Nix CI"
+name: "CI - Nix"
 
-on: [pull_request, push]
+on:
+  push:
 
 jobs:
   tests:
@@ -11,10 +12,9 @@ jobs:
         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 }}
+      - uses: cachix/install-nix-action@v27
+      - uses: cachix/cachix-action@v15
+        with:
+          name: gepetto
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+      - run: nix build -L
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 1e573b7..0000000
--- a/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  hpp-util,
-  jrl-cmakemodules,
-  omniorb,
-  pkg-config,
-}:
-
-stdenv.mkDerivation {
-  pname = "hpp-template-corba";
-  version = "5.0.0";
-
-  src = lib.fileset.toSource {
-    root = ./.;
-    fileset = lib.fileset.unions [
-      ./CMakeLists.txt
-      ./doc
-      ./idl
-      ./include
-      ./package.xml
-      ./src
-      ./tests
-    ];
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-  propagatedBuildInputs = [
-    jrl-cmakemodules
-    hpp-util
-    omniorb
-  ];
-
-  doCheck = true;
-
-  meta = {
-    description = "This package is intended to ease construction of CORBA servers by templating actions that are common to all servers";
-    homepage = "https://github.com/humanoid-path-planner/hpp-template-corba";
-    license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.nim65s ];
-  };
-}
diff --git a/flake.lock b/flake.lock
index f9d638d..291df13 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,41 +20,17 @@
         "type": "github"
       }
     },
-    "hpp-util": {
-      "inputs": {
-        "flake-parts": [
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719769497,
-        "narHash": "sha256-cYONa7WTagNZCITtocdII+WcfdzZnvznFUyb7YLodIw=",
-        "owner": "humanoid-path-planner",
-        "repo": "hpp-util",
-        "rev": "8811dcadeec6b1e52b4cd59da39ad2e170f17ad7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "humanoid-path-planner",
-        "repo": "hpp-util",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719674427,
-        "narHash": "sha256-z2hCpVyfnmYTA5iabf1SW4peFV9itE1JJcXNBKIFkDg=",
-        "owner": "nim65s",
+        "lastModified": 1727174734,
+        "narHash": "sha256-xa3TynMF5vaWonmTOg/Ejc1Fmo0GkQnCaVRVkBc3z2I=",
+        "owner": "gepetto",
         "repo": "nixpkgs",
-        "rev": "b81610d293fac26c2ec6a81718a979bc25f8c155",
+        "rev": "0ad139a0e4372abc12320c8c92ee90e0e5e296e1",
         "type": "github"
       },
       "original": {
-        "owner": "nim65s",
-        "ref": "gepetto",
+        "owner": "gepetto",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -62,7 +38,6 @@
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "hpp-util": "hpp-util",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 9e606b4..7da856e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,28 +1,17 @@
 {
   description = "This package is intended to ease construction of CORBA servers by templating actions that are common to all servers";
 
-  nixConfig = {
-    extra-substituters = [ "https://gepetto.cachix.org" ];
-    extra-trusted-public-keys = [ "gepetto.cachix.org-1:toswMl31VewC0jGkN6+gOelO2Yom0SOHzPwJMY2XiDY=" ];
-  };
-
   inputs = {
-    nixpkgs.url = "github:nim65s/nixpkgs/gepetto";
+    nixpkgs.url = "github:gepetto/nixpkgs";
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
-    hpp-util = {
-      url = "github:humanoid-path-planner/hpp-util";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-    };
   };
 
   outputs =
-    inputs@{ flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      imports = [ ];
+    inputs:
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
         "x86_64-linux"
         "aarch64-linux"
@@ -30,18 +19,26 @@
         "x86_64-darwin"
       ];
       perSystem =
+        { pkgs, self', ... }:
         {
-          self',
-          pkgs,
-          system,
-          ...
-        }:
-        {
+          devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
           packages = {
-            inherit (pkgs) cachix;
-            default = pkgs.callPackage ./. { hpp-util = inputs.hpp-util.packages.${system}.default; };
+            default = self'.packages.hpp-template-corba;
+            hpp-template-corba = pkgs.hpp-template-corba.overrideAttrs (_: {
+              src = pkgs.lib.fileset.toSource {
+                root = ./.;
+                fileset = pkgs.lib.fileset.unions [
+                  ./CMakeLists.txt
+                  ./doc
+                  ./idl
+                  ./include
+                  ./package.xml
+                  ./src
+                  ./tests
+                ];
+              };
+            });
           };
-          devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
         };
     };
 }

From 65da333be9cc12f2867e24cad87ca31823993b24 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 7 Oct 2024 17:31:50 +0200
Subject: [PATCH 09/11] setup mergify

---
 .mergify.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000..8e98970
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,11 @@
+pull_request_rules:
+  - name: merge automatically when CI passes and PR is approved
+    conditions:
+      - check-success = "gitlab-ci"
+      - check-success = "Nix build on ubuntu"
+      - check-success = "pre-commit.ci - pr"
+      - or:
+        - author = pre-commit-ci[bot]
+        - author = dependabot[bot]
+    actions:
+      merge:

From b8b139fd02f371b3e01d5b0a0478b4a3ce257969 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 17:46:23 +0000
Subject: [PATCH 10/11] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.5.5 → v0.6.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.5...v0.6.9)
- [github.com/pre-commit/mirrors-clang-format: v18.1.8 → v19.1.1](https://github.com/pre-commit/mirrors-clang-format/compare/v18.1.8...v19.1.1)
- [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.6.0...v5.0.0)
---
 .pre-commit-config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 263f1be..ae52b97 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.5.5
+  rev: v0.6.9
   hooks:
   - id: ruff
     args:
@@ -19,13 +19,13 @@ repos:
   - id: toml-sort-fix
     exclude: poetry.lock
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v18.1.8
+  rev: v19.1.1
   hooks:
   - id: clang-format
     args:
     - --style=Google
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id: check-added-large-files
   - id: check-ast

From 5ab98f638f33ba6283494aae7e0a19a214e53b82 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 8 Oct 2024 13:03:23 +0200
Subject: [PATCH 11/11] sync submodule

---
 cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake b/cmake
index 2bea127..4b829af 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 2bea127e8113a32f216ae7a7201e36a6e7c56cc2
+Subproject commit 4b829af01672f0a7d26b1ae8b69c828905e1e3dc