Skip to content

Commit 01f76e6

Browse files
authored
Merge pull request #235 from humanoid-path-planner/update_flake_lock_action
flake.lock: Update
2 parents 7ef515e + 2301ad0 commit 01f76e6

File tree

2 files changed

+50
-80
lines changed

2 files changed

+50
-80
lines changed

flake.lock

Lines changed: 18 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 32 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,39 @@
1212

1313
outputs =
1414
inputs:
15-
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
16-
systems = import inputs.systems;
17-
imports = [
18-
inputs.gepetto.flakeModule
19-
{
20-
gepetto-pkgs.overlays = [
21-
(final: prev: {
22-
hpp-core = prev.hpp-core.overrideAttrs (super: {
23-
patches = super.patches ++ [
24-
(final.fetchpatch {
25-
url = "https://github.com/humanoid-path-planner/hpp-core/pull/391.patch";
26-
hash = "sha256-oqbeUr+Y88hhI8BmCWGVT1ZvI05+YW4TEiEeymaFQ/E=";
27-
})
28-
];
29-
});
30-
})
31-
];
32-
}
33-
];
34-
perSystem =
35-
{
36-
lib,
37-
pkgs,
38-
self',
39-
...
40-
}:
41-
{
42-
packages = {
43-
default = self'.packages.hpp-manipulation;
44-
hpp-manipulation = pkgs.hpp-manipulation.overrideAttrs {
45-
patches = [ ];
46-
src = lib.fileset.toSource {
47-
root = ./.;
48-
fileset = lib.fileset.unions [
49-
./CMakeLists.txt
50-
./doc
51-
./include
52-
./package.xml
53-
./plugins
54-
./src
55-
./tests
56-
];
57-
};
15+
inputs.flake-parts.lib.mkFlake { inherit inputs; } (
16+
{ lib, self, ... }:
17+
{
18+
systems = import inputs.systems;
19+
imports = [
20+
inputs.gepetto.flakeModule
21+
{ gepetto-pkgs.overlays = [ self.overlays.default ]; }
22+
];
23+
flake.overlays.default = _final: prev: {
24+
hpp-manipulation = prev.hpp-manipulation.overrideAttrs {
25+
src = lib.fileset.toSource {
26+
root = ./.;
27+
fileset = lib.fileset.unions [
28+
./CMakeLists.txt
29+
./doc
30+
./include
31+
./package.xml
32+
./plugins
33+
./src
34+
./tests
35+
];
5836
};
5937
};
6038
};
61-
};
39+
perSystem =
40+
{ pkgs, self', ... }:
41+
{
42+
packages = {
43+
default = self'.packages.hpp-manipulation;
44+
hpp-manipulation = pkgs.hpp-manipulation;
45+
46+
};
47+
};
48+
}
49+
);
6250
}

0 commit comments

Comments
 (0)