nix: move package to nixpkgs

humanoid-path-planner · Oct 7, 2024 · 6fd12df · 6fd12df
1 parent f0abf03
commit 6fd12df
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 145 deletions.
diff --git 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
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,49 +2,42 @@
   description = "Multi contact trajectory generation for the COM using Bezier curves";
 
   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-centroidal-dynamics = {
-      url = "github:humanoid-path-planner/hpp-centroidal-dynamics";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-    };
-    ndcurves = {
-      url = "github:loco-3d/ndcurves/release/1.5.0";
-      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"
         "aarch64-darwin"
         "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-centroidal-dynamics = inputs.hpp-centroidal-dynamics.packages.${system}.default;
-              ndcurves = inputs.ndcurves.packages.${system}.default;
-            };
+            default = self'.packages.hpp-bezier-com-traj;
+            hpp-bezier-com-traj = pkgs.hpp-bezier-com-traj.overrideAttrs (_: {
+              src = pkgs.lib.fileset.toSource {
+                root = ./.;
+                fileset = pkgs.lib.fileset.unions [
+                  ./CMakeLists.txt
+                  ./include
+                  ./package.xml
+                  ./python
+                  ./src
+                  ./tests
+                ];
+              };
+            });
           };
-          devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
         };
     };
 }