Merge branch 'holochain-0.2' into 2023-09-15-fix-linked-collection-te…

…mplates-holochain-0.2
holochain · Sep 20, 2023 · 46b4e88 · 46b4e88
2 parents 8c49a56 + f0b878c
commit 46b4e88
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 79 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -11,24 +11,24 @@ jobs:
   testbuild:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Extend space
         uses: ./.github/actions/extend-space
 
       - name: Install nix
-        uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v23
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.12.0/install
+          install_url: https://releases.nixos.org/nix/nix-2.13.3/install
           extra_nix_config: |
             experimental-features = flakes nix-command
 
       - uses: cachix/cachix-action@v12
         with:
           name: holochain-ci
 
-      - name: Install and test
+      - name: Build and test
         run: |
           cd $GITHUB_WORKSPACE
-          nix develop --override-input "versions/scaffolding" . --command ./run_test.sh
+          nix develop --override-input "versions/scaffolding" . .#ci --command ./run_test.sh
 
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,35 +1,42 @@
 {
   description = "Template for Holochain app development";
 
-inputs = {
-    nixpkgs.follows = "holochain-flake/nixpkgs";
+  inputs = {
+    nixpkgs.follows = "holochain/nixpkgs";
     versions.url = "github:holochain/holochain?dir=versions/0_2";
 
-    holochain-flake = {
+    holochain = {
       url = "github:holochain/holochain";
       inputs.versions.follows = "versions";
     };
   };
 
-  outputs = inputs @ { ... }:
-    inputs.holochain-flake.inputs.flake-parts.lib.mkFlake
-      {
-        inherit inputs;
-      }
-      {
-        systems = builtins.attrNames inputs.holochain-flake.devShells;
-        perSystem =
-          { config
-          , pkgs
-          , system
-          , ...
-          }: {
-            devShells.default = pkgs.mkShell {
-              inputsFrom = [ inputs.holochain-flake.devShells.${system}.holonix ];
-              packages = with pkgs; [
-                  pkgs.nodejs-18_x 
-              ];
-            };
-          };
+  outputs = inputs @ {...}:
+    inputs.holochain.inputs.flake-parts.lib.mkFlake
+    {
+      inherit inputs;
+    }
+    {
+      systems = builtins.attrNames inputs.holochain.devShells;
+      perSystem = {
+        self',
+        inputs',
+        config,
+        pkgs,
+        system,
+        ...
+      }: {
+        devShells.default = pkgs.mkShell {
+          inputsFrom = [inputs'.holochain.devShells.rustDev];
+          packages = [pkgs.nodejs-18_x];
+        };
+
+        devShells.ci = pkgs.mkShell {
+          inputsFrom = [self'.devShells.default];
+          packages = [
+            inputs'.holochain.packages.hc-scaffold
+          ];
+        };
       };
-}
+    };
+}