Merge pull request #10 from darksoil-studio/develop

Develop
darksoil-studio · Sep 26, 2024 · f47e92c · f47e92c
2 parents 3d7bd8e + 7e84f16
commit f47e92c
Show file tree

Hide file tree

Showing 12 changed files with 619 additions and 987 deletions.
diff --git a/.github/workflows/build-and-cache.yaml b/.github/workflows/build-and-cache.yaml
@@ -45,37 +45,37 @@ jobs:
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
-          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#roles_integrity
-          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles_integrity | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#roles_integrity.meta.debug
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles_integrity.meta.debug | nix run nixpkgs#jq -- -r 'keys[0]')
 
-          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#roles
-          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#roles.meta.debug
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles.meta.debug | nix run nixpkgs#jq -- -r 'keys[0]')
 
       - name: Pin debug zomes
         if: github.event_name != 'pull_request'
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
-          cachix pin darksoil-studio roles_integrity_debug $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles_integrity | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix pin darksoil-studio roles_integrity_debug $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles_integrity.meta.debug | nix run nixpkgs#jq -- -r 'keys[0]')
 
-          cachix pin darksoil-studio roles_debug $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix pin darksoil-studio roles_debug $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles.meta.debug | nix run nixpkgs#jq -- -r 'keys[0]')
 
       - name: Build release zomes
         if: matrix.os == 'ubuntu-latest'
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
-          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#roles_integrity.meta.release
-          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles_integrity.meta.release | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#roles_integrity
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles_integrity | nix run nixpkgs#jq -- -r 'keys[0]')
 
-          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#roles.meta.release
-          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles.meta.release | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#roles
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles | nix run nixpkgs#jq -- -r 'keys[0]')
 
       - name: Build release zomes
         if: matrix.os == 'ubuntu-latest' && github.event_name != 'pull_request'
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
-          cachix pin darksoil-studio roles_integrity $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles_integrity.meta.release | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix pin darksoil-studio roles_integrity $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles_integrity | nix run nixpkgs#jq -- -r 'keys[0]')
 
-          cachix pin darksoil-studio roles $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles.meta.release | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix pin darksoil-studio roles $(nix path-info --json --accept-flake-config --no-warn-dirty .#roles | nix run nixpkgs#jq -- -r 'keys[0]')
diff --git a/crates/hc-progenitor/default.nix b/crates/hc-progenitor/default.nix
@@ -16,14 +16,9 @@
           (craneLib.path ../../.);
         doCheck = false;
         buildInputs =
-          inputs.hc-infra.outputs.lib.holochainDeps { inherit pkgs lib; }
-          ++ inputs.p2p-shipyard.lib.tauriAppDeps.buildInputs {
-            inherit pkgs lib;
-          };
+          inputs.p2p-shipyard.outputs.dependencies.${system}.tauriHapp.buildInputs;
         nativeBuildInputs =
-          (inputs.p2p-shipyard.lib.tauriAppDeps.nativeBuildInputs {
-            inherit pkgs lib;
-          });
+          inputs.p2p-shipyard.outputs.dependencies.${system}.tauriHapp.nativeBuildInputs;
         postPatch = ''
           mkdir -p "$TMPDIR/nix-vendor"
           cp -Lr "$cargoVendorDir" -T "$TMPDIR/nix-vendor"