Skip to content

Commit db386e9

Browse files
committed
nix: clean flake inputs
1 parent ab24564 commit db386e9

File tree

3 files changed

+21
-44
lines changed

3 files changed

+21
-44
lines changed

.github/workflows/nix.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414
- uses: DeterminateSystems/nix-installer-action@main
15-
with:
16-
extra-conf: |
17-
trusted-substituters = https://gepetto.cachix.org
18-
trusted-public-keys = gepetto.cachix.org-1:toswMl31VewC0jGkN6+gOelO2Yom0SOHzPwJMY2XiDY=
1915
- uses: DeterminateSystems/magic-nix-cache-action@main
20-
- run: nix build --accept-flake-config
16+
- run: nix --accept-flake-config build -L
17+
- run: nix --accept-flake-config run .#cachix push gepetto $(readlink result)
18+
env:
19+
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}

flake.lock

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

flake.nix

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,20 @@
1212
url = "github:hercules-ci/flake-parts";
1313
inputs.nixpkgs-lib.follows = "nixpkgs";
1414
};
15-
hpp-util = {
16-
url = "github:humanoid-path-planner/hpp-util/release/5.1.0";
17-
inputs.nixpkgs.follows = "nixpkgs";
18-
inputs.flake-parts.follows = "flake-parts";
19-
};
2015
hpp-core = {
2116
url = "github:humanoid-path-planner/hpp-core/release/5.1.0";
22-
inputs.nixpkgs.follows = "nixpkgs";
23-
inputs.flake-parts.follows = "flake-parts";
24-
inputs.hpp-util.follows = "hpp-util";
17+
inputs = {
18+
nixpkgs.follows = "nixpkgs";
19+
flake-parts.follows = "flake-parts";
20+
};
2521
};
2622
hpp-template-corba = {
2723
url = "github:humanoid-path-planner/hpp-template-corba/release/5.1.0";
28-
inputs.nixpkgs.follows = "nixpkgs";
29-
inputs.flake-parts.follows = "flake-parts";
30-
inputs.hpp-util.follows = "hpp-util";
24+
inputs = {
25+
nixpkgs.follows = "nixpkgs";
26+
flake-parts.follows = "flake-parts";
27+
hpp-util.follows = "hpp-core/hpp-constraints/hpp-util";
28+
};
3129
};
3230
};
3331

@@ -49,9 +47,12 @@
4947
...
5048
}:
5149
{
52-
packages.default = pkgs.callPackage ./. {
53-
hpp-core = inputs.hpp-core.packages.${system}.default;
54-
hpp-template-corba = inputs.hpp-template-corba.packages.${system}.default;
50+
packages = {
51+
inherit (pkgs) cachix;
52+
default = pkgs.callPackage ./. {
53+
hpp-core = inputs.hpp-core.packages.${system}.default;
54+
hpp-template-corba = inputs.hpp-template-corba.packages.${system}.default;
55+
};
5556
};
5657
devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
5758
};

0 commit comments

Comments
 (0)