Merge pull request #9 from cspr-rad/add-cachix

Add cachix
cspr-rad · Feb 6, 2024 · 7acff27 · 7acff27
2 parents fabdf68 + 25b2d4b
commit 7acff27
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -15,6 +15,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - uses: cachix/cachix-action@v12
+        with:
+          name: risc0pkgs
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - name: System Info
         run: |

diff --git a/flake.nix b/flake.nix
@@ -1,8 +1,19 @@
 {
   description = "A collection of risc0 related packages";
+
+  nixConfig = {
+    extra-substituters = [
+      "https://risc0pkgs.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "risc0pkgs.cachix.org-1:EY5UazX0/Q7hGCm6xQSgKX6UkpzyOf07pxjfhhRK7kE="
+    ];
+  };
+
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
   };
+
   outputs = { self, nixpkgs, ... }:
     let
       eachSystem = systems: f:

diff --git a/templates/default/flake.nix b/templates/default/flake.nix
@@ -1,12 +1,20 @@
 {
   description = "risc0 project template";
+
+  nixConfig = {
+    extra-substituters = [
+      "https://risc0pkgs.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "risc0pkgs.cachix.org-1:EY5UazX0/Q7hGCm6xQSgKX6UkpzyOf07pxjfhhRK7kE="
+    ];
+  };
+
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    risc0pkgs = {
-      url = "github:cspr-rad/risc0pkgs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    nixpkgs.follows = "risc0pkgs/nixpkgs";
+    risc0pkgs.url = "github:cspr-rad/risc0pkgs";
   };
+
   outputs = { self, nixpkgs, risc0pkgs }:
     let
       systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];