Fixes (#6)

* chore: Remove build artifacts * fix: Nixpkgs versions * Prep for review
argumentcomputer · Mar 5, 2025 · 29b86ca · 29b86ca
1 parent 17e862c
commit 29b86ca
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 101 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,11 +16,15 @@ jobs:
     runs-on: warp-ubuntu-latest-x64-16x
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: cachix/cachix-action@v14
+      - uses: cachix/install-nix-action@v30
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: cachix/cachix-action@v15
         with:
           name: argumentcomputer
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - run: |
-          nix build .#cacheRoots
+      - run: nix build .#cacheRoots
+      - run: nix build
+        working-directory: ${{ github.workspace }}/templates/minimal
 
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 !.gitignore
-templates/**/flake.lock
 **/result*
 **/.lake
diff --git a/flake.lock b/flake.lock
diff --git a/templates/dependency/flake.lock b/templates/dependency/flake.lock
diff --git a/templates/dependency/flake.nix b/templates/dependency/flake.nix
@@ -4,7 +4,10 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    lean4-nix.url = "github:argumentcomputer/lean4-nix";
+    lean4-nix = {
+      url = "github:argumentcomputer/lean4-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs @ {

diff --git a/templates/dependency/result b/templates/dependency/result
diff --git a/templates/minimal/flake.lock b/templates/minimal/flake.lock
diff --git a/templates/minimal/flake.nix b/templates/minimal/flake.nix
@@ -4,7 +4,10 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    lean4-nix.url = "github:argumentcomputer/lean4-nix";
+    lean4-nix = {
+      url = "github:argumentcomputer/lean4-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs @ {