Merge pull request #119 from nim65s/gepetto-nix

Nix: update gepetto/nix use

Author: nim65s

.github/workflows/nix.yml

@@ -1,27 +1,38 @@
 name: "CI - Nix"
-
 on:
   push:
     branches:
       - devel
       - master
+      - main
+      - stable
   pull_request:
     branches:
       - devel
       - master
-
+      - main
+      - stable
 jobs:
-  tests:
-    name: "Nix build on ${{ matrix.os }}"
+  nix:
     runs-on: "${{ matrix.os }}-latest"
     strategy:
       matrix:
-        os: [ubuntu]
+        os: [ubuntu, macos]
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/install-nix-action@v31
+      - uses: cachix/cachix-action@v16
         with:
           name: gepetto
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - run: nix build -L
+      - run: nix flake check -L
+  check:
+    if: always()
+    name: check-macos-linux-nix
+    runs-on: ubuntu-latest
+    needs:
+      - nix
+    steps:
+      - uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

.mergify.yml

@@ -1,13 +1,12 @@
 pull_request_rules:
-  - name: merge automatically when CI passes and PR is approved
+  - name: merge [bot] PRs when CI pass
     conditions:
-      - check-success = "gitlab-ci"
-      - check-success = "Nix build on ubuntu"
+      - check-success = "check-macos-linux-nix"
       - check-success = "pre-commit.ci - pr"
       - or:
-        - author = dependabot[bot]
-        - author = github-actions[bot]
-        - author = hrp2-14
-        - author = pre-commit-ci[bot]
+          - author = dependabot[bot]
+          - author = github-actions[bot]
+          - author = hrp2-14
+          - author = pre-commit-ci[bot]
     actions:
       merge:

flake.nix

@@ -2,38 +2,33 @@
   description = "Tutorial for humanoid path planner platform";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/refs/pull/362956/head";
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs";
-    };
+    gepetto.url = "github:gepetto/nix";
+    flake-parts.follows = "gepetto/flake-parts";
+    nixpkgs.follows = "gepetto/nixpkgs";
+    nix-ros-overlay.follows = "gepetto/nix-ros-overlay";
+    systems.follows = "gepetto/systems";
+    treefmt-nix.follows = "gepetto/treefmt-nix";
   };
 
   outputs =
-    inputs@{ flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      imports = [ ];
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "aarch64-darwin"
-        "x86_64-darwin"
-      ];
+    inputs:
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = import inputs.systems;
+      imports = [ inputs.gepetto.flakeModule ];
       perSystem =
         {
-          self',
+          lib,
           pkgs,
-          system,
+          self',
           ...
         }:
         {
-          devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
           packages = {
             default = self'.packages.hpp-tutorial;
-            hpp-tutorial = pkgs.python3Packages.hpp-tutorial.overrideAttrs (_: {
-              src = pkgs.lib.fileset.toSource {
+            hpp-tutorial = pkgs.python3Packages.hpp-tutorial.overrideAttrs {
+              src = lib.fileset.toSource {
                 root = ./.;
-                fileset = pkgs.lib.fileset.unions [
+                fileset = lib.fileset.unions [
                   ./CMakeLists.txt
                   ./doc
                   ./include
@@ -47,7 +42,7 @@
                   ./urdf
                 ];
               };
-            });
+            };
           };
         };
     };