Merge branch 'main' into main-0.3

holochain · Sep 2, 2024 · fb9e3c0 · fb9e3c0
2 parents 8ea11db + 029e93b
commit fb9e3c0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 14 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -27,7 +27,9 @@ jobs:
       - name: Install nix
         uses: cachix/install-nix-action@v27
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.24.4/install
+          extra_nix_config: |
+            accept-flake-config = true
 
       - uses: cachix/cachix-action@v15
         with:
@@ -99,7 +101,9 @@ jobs:
       - name: Install nix
         uses: cachix/install-nix-action@v27
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.24.4/install
+          extra_nix_config: |
+            accept-flake-config = true
 
       - uses: cachix/cachix-action@v15
         with:
@@ -134,11 +138,9 @@ jobs:
 
       - uses: cachix/install-nix-action@v27
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
-
-      - uses: cachix/cachix-action@v15
-        with:
-          name: holochain-ci
+          install_url: https://releases.nixos.org/nix/nix-2.24.4/install
+          extra_nix_config: |
+            accept-flake-config = true
 
       - name: Extract branch name
         id: extract_branch

diff --git a/.github/workflows/command-listener.yaml b/.github/workflows/command-listener.yaml
@@ -48,7 +48,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.24.4/install
+          extra_nix_config: |
+            accept-flake-config = true
       - name: set up git config
         run: |
           ./scripts/ci-git-config.sh
@@ -72,7 +74,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.24.4/install
+          extra_nix_config: |
+            accept-flake-config = true
       - name: set up git config
         run: |
           ./scripts/ci-git-config.sh
@@ -96,7 +100,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v27
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.24.4/install
+          extra_nix_config: |
+            accept-flake-config = true
       - name: set up git config
         run: |
           ./scripts/ci-git-config.sh

diff --git a/.github/workflows/holonix-cache.yaml b/.github/workflows/holonix-cache.yaml
@@ -43,7 +43,9 @@ jobs:
     steps:
       - uses: cachix/install-nix-action@v27
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.24.4/install
+          extra_nix_config: |
+            accept-flake-config = true
       - uses: cachix/cachix-action@v15
         with:
           name: holochain-ci
@@ -103,7 +105,9 @@ jobs:
     steps:
       - uses: cachix/install-nix-action@v27
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.24.4/install
+          extra_nix_config: |
+            accept-flake-config = true
       - uses: cachix/cachix-action@v15
         with:
           name: holochain-ci

diff --git a/.github/workflows/holonix-update.yaml b/.github/workflows/holonix-update.yaml
@@ -57,7 +57,9 @@ jobs:
           ref: ${{ inputs.branch }}
       - uses: cachix/install-nix-action@v27
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
+          install_url: https://releases.nixos.org/nix/nix-2.24.4/install
+          extra_nix_config: |
+            accept-flake-config = true
       - name: Run the Holochain bump script
         if: ${{ inputs.update-holochain }}
         run: |

diff --git a/flake.nix b/flake.nix
@@ -12,7 +12,6 @@
     # lib to build a nix package from a rust crate
     crane = {
       url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # Rust toolchain
@@ -361,4 +360,9 @@
         };
       };
     };
+
+  nixConfig = {
+    substituters = [ "https://cache.nixos.org" "https://holochain-ci.cachix.org" ];
+    trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "holochain-ci.cachix.org-1:5IUSkZc0aoRS53rfkvH9Kid40NpyjwCMCzwRTXy+QN8=" ];
+  };
 }