nix: clean flake inputs

humanoid-path-planner · Jun 30, 2024 · db386e9 · db386e9
1 parent ab24564
commit db386e9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 44 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -12,9 +12,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
-        with:
-          extra-conf: |
-            trusted-substituters = https://gepetto.cachix.org
-            trusted-public-keys = gepetto.cachix.org-1:toswMl31VewC0jGkN6+gOelO2Yom0SOHzPwJMY2XiDY=
       - uses: DeterminateSystems/magic-nix-cache-action@main
-      - run: nix build --accept-flake-config
+      - run: nix --accept-flake-config build -L
+      - run: nix --accept-flake-config run .#cachix push gepetto $(readlink result)
+        env:
+          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,22 +12,20 @@
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
-    hpp-util = {
-      url = "github:humanoid-path-planner/hpp-util/release/5.1.0";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-    };
     hpp-core = {
       url = "github:humanoid-path-planner/hpp-core/release/5.1.0";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-      inputs.hpp-util.follows = "hpp-util";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-parts.follows = "flake-parts";
+      };
     };
     hpp-template-corba = {
       url = "github:humanoid-path-planner/hpp-template-corba/release/5.1.0";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-      inputs.hpp-util.follows = "hpp-util";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-parts.follows = "flake-parts";
+        hpp-util.follows = "hpp-core/hpp-constraints/hpp-util";
+      };
     };
   };
 
@@ -49,9 +47,12 @@
           ...
         }:
         {
-          packages.default = pkgs.callPackage ./. {
-            hpp-core = inputs.hpp-core.packages.${system}.default;
-            hpp-template-corba = inputs.hpp-template-corba.packages.${system}.default;
+          packages = {
+            inherit (pkgs) cachix;
+            default = pkgs.callPackage ./. {
+              hpp-core = inputs.hpp-core.packages.${system}.default;
+              hpp-template-corba = inputs.hpp-template-corba.packages.${system}.default;
+            };
           };
           devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
         };