Skip to content
Snippets Groups Projects
Unverified Commit 6289d8a1 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #173 from humanoid-path-planner/nix 

nix: move package to nixpkgs
parents 0bd34570 07cd24d2
No related branches found
No related tags found
No related merge requests found
Pipeline #44909 failed
Hide whitespace changes
Inline Side-by-side
.github/workflows/nix.yml
+ 9
− 9
View file @ 6289d8a1
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
default.nix deleted 100644 → 0
+ 0
− 42
View file @ 0bd34570
{
lib,
stdenv,
cmake,
hpp-core,
hpp-universal-robot,
}:
stdenv.mkDerivation {
pname = "hpp-manipulation";
version = "5.0.0";
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [
./CMakeLists.txt
./doc
./include
./package.xml
./plugins
./src
./tests
];
};
strictDeps = true;
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [
hpp-core
hpp-universal-robot
];
doCheck = true;
meta = {
description = "Classes for manipulation planning";
homepage = "https://github.com/humanoid-path-planner/hpp-manipulation";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.nim65s ];
};
}
flake.lock
+ 5
− 209
View file @ 6289d8a1
......@@ -20,219 +20,17 @@
"type": "github"
}
},
"hpp-constraints": {
"inputs": {
"flake-parts": [
"hpp-core",
"flake-parts"
],
"hpp-pinocchio": "hpp-pinocchio",
"hpp-statistics": "hpp-statistics",
"hpp-util": "hpp-util",
"nixpkgs": [
"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-core": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"hpp-constraints": "hpp-constraints",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719770669,
"narHash": "sha256-GzlQ4kfiMUf9qVP5t+/qoQZbBIOe1JPdmL7+86dJVaQ=",
"owner": "humanoid-path-planner",
"repo": "hpp-core",
"rev": "5aa007c687c080608c9864d239f523d452bd7181",
"type": "github"
},
"original": {
"owner": "humanoid-path-planner",
"repo": "hpp-core",
"type": "github"
}
},
"hpp-environments": {
"inputs": {
"flake-parts": [
"hpp-core",
"hpp-constraints",
"hpp-pinocchio",
"flake-parts"
],
"nixpkgs": [
"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-core",
"hpp-constraints",
"flake-parts"
],
"hpp-environments": "hpp-environments",
"hpp-util": [
"hpp-core",
"hpp-constraints",
"hpp-util"
],
"nixpkgs": [
"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-core",
"hpp-constraints",
"flake-parts"
],
"hpp-util": [
"hpp-core",
"hpp-constraints",
"hpp-util"
],
"nixpkgs": [
"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-universal-robot": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719769533,
"narHash": "sha256-Fyq7P+YZDGUKxOrif0id1WIeMKu5o/7FM+CRpBCPC2A=",
"owner": "humanoid-path-planner",
"repo": "hpp-universal-robot",
"rev": "789a540f150b7dc50f3409d94338b7aa96f74084",
"type": "github"
},
"original": {
"owner": "humanoid-path-planner",
"repo": "hpp-universal-robot",
"type": "github"
}
},
"hpp-util": {
"inputs": {
"flake-parts": [
"hpp-core",
"hpp-constraints",
"flake-parts"
],
"nixpkgs": [
"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"
}
},
"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"
}
......@@ -240,8 +38,6 @@
"root": {
"inputs": {
"flake-parts": "flake-parts",
"hpp-core": "hpp-core",
"hpp-universal-robot": "hpp-universal-robot",
"nixpkgs": "nixpkgs"
}
}
......
flake.nix
+ 20
− 31
View file @ 6289d8a1
{
description = "Classes for manipulation planning";
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-core = {
url = "github:humanoid-path-planner/hpp-core";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
};
hpp-universal-robot = {
url = "github:humanoid-path-planner/hpp-universal-robot";
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"
......@@ -35,21 +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-core = inputs.hpp-core.packages.${system}.default;
hpp-universal-robot = inputs.hpp-universal-robot.packages.${system}.default;
};
default = self'.packages.hpp-manipulation;
hpp-manipulation = pkgs.hpp-manipulation.overrideAttrs (_: {
src = pkgs.lib.fileset.toSource {
root = ./.;
fileset = pkgs.lib.fileset.unions [
./CMakeLists.txt
./doc
./include
./package.xml
./plugins
./src
./tests
];
};
});
};
devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
};
};
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment