Skip to content

Commit

Permalink
Merge pull request #208 from humanoid-path-planner/nix
Browse files Browse the repository at this point in the history
nix: move package to nixpkgs
  • Loading branch information
nim65s authored Oct 7, 2024
2 parents 6250730 + 717f34c commit ce80390
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 139 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: "Nix CI"
name: "CI - Nix"

on: [pull_request, push]
on:
push:

jobs:
tests:
Expand All @@ -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
45 changes: 0 additions & 45 deletions default.nix

This file was deleted.

59 changes: 5 additions & 54 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 19 additions & 31 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,55 +1,43 @@
{
description = "Wrapping of Pinocchio library into HPP";

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-environments = {
url = "github:humanoid-path-planner/hpp-environments";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
};
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"
"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-environments = inputs.hpp-environments.packages.${system}.default;
hpp-util = inputs.hpp-util.packages.${system}.default;
};
default = self'.packages.hpp-pinocchio;
hpp-pinocchio = pkgs.hpp-pinocchio.overrideAttrs (_: {
src = pkgs.lib.fileset.toSource {
root = ./.;
fileset = pkgs.lib.fileset.unions [
./CMakeLists.txt
./doc
./include
./package.xml
./src
./tests
];
};
});
};
devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
};
};
}

0 comments on commit ce80390

Please sign in to comment.