Align deps for zomes

holochain-open-dev · May 28, 2024 · 0e595ec · 0e595ec
1 parent a9f2b5f
commit 0e595ec
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 123 deletions.
diff --git a/flake.nix b/flake.nix
@@ -92,24 +92,20 @@
                 (inputs.crane.mkLib pkgs).overrideToolchain rustToolchain;
             in craneLib;
 
-          zomeCargoDeps = { craneLib, debug ? false }:
+          zomeCargoArtifacts = { craneLib, src, debug ? false }:
             let
               commonArgs = {
                 doCheck = false;
-                src = craneLib.cleanCargoSource
-                  (craneLib.path ./nix/reference-happ);
+                inherit src;
                 CARGO_BUILD_TARGET = "wasm32-unknown-unknown";
                 CARGO_PROFILE = if debug then "debug" else "release";
               };
-
-              cargoVendorDir = craneLib.vendorCargoDeps commonArgs;
               cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
-                inherit cargoVendorDir;
                 pname = "zome";
                 version = "for-holochain-0_3_rc";
               });
 
-            in { inherit cargoArtifacts cargoVendorDir; };
+            in cargoArtifacts;
 
           holochainCargoDeps = { pkgs, lib, craneLib, debug ? false }:
             let
@@ -157,7 +153,7 @@
 
             in pkgs.callPackage ./nix/zome.nix {
               inherit deterministicCraneLib craneLib crateCargoToml
-                workspacePath zomeCargoDeps;
+                workspacePath zomeCargoArtifacts;
             };
           sweettest = { holochain, dna, workspacePath, crateCargoToml }:
             let
@@ -244,42 +240,42 @@
           '';
         };
 
-        devShells.zomeDev = let
-          configureCargoVendoredDepsHook =
-            pkgs.writeShellScriptBin "configureCargoVendoredDeps"
-            (builtins.readFile ./nix/configureCargoVendoredDepsHook.sh);
-          inheritCargoArtifacts =
-            pkgs.writeShellScriptBin "inheritCargoArtifacts"
-            (builtins.readFile ./nix/inheritCargoArtifacts.sh);
-          craneLib = flake.lib.holochainCraneLib { inherit system; };
-          zomeDeps = flake.lib.zomeCargoDeps { inherit craneLib; };
-        in pkgs.mkShell {
-          packages = [ configureCargoVendoredDepsHook inheritCargoArtifacts ];
-
-          shellHook = ''
-            cargoVendorDir=${zomeDeps.cargoVendorDir} configureCargoVendoredDeps
-            cargoArtifacts=${zomeDeps.cargoArtifacts} inheritCargoArtifacts
-          '';
-        };
-
-        devShells.sweettestDev = let
-          configureCargoVendoredDepsHook =
-            pkgs.writeShellScriptBin "configureCargoVendoredDeps"
-            (builtins.readFile ./nix/configureCargoVendoredDepsHook.sh);
-          inheritCargoArtifacts =
-            pkgs.writeShellScriptBin "inheritCargoArtifacts"
-            (builtins.readFile ./nix/inheritCargoArtifacts.sh);
-          craneLib = flake.lib.holochainCraneLib { inherit system; };
-          holochainDeps =
-            pkgs.callPackage flake.lib.holochainCargoDeps { inherit craneLib; };
-        in pkgs.mkShell {
-          packages = [ configureCargoVendoredDepsHook inheritCargoArtifacts ];
-
-          shellHook = ''
-            cargoVendorDir=${holochainDeps.cargoVendorDir} configureCargoVendoredDeps
-            cargoArtifacts=${holochainDeps.cargoArtifacts} inheritCargoArtifacts
-          '';
-        };
+        # devShells.zomeDev = let
+        #   configureCargoVendoredDepsHook =
+        #     pkgs.writeShellScriptBin "configureCargoVendoredDeps"
+        #     (builtins.readFile ./nix/configureCargoVendoredDepsHook.sh);
+        #   inheritCargoArtifacts =
+        #     pkgs.writeShellScriptBin "inheritCargoArtifacts"
+        #     (builtins.readFile ./nix/inheritCargoArtifacts.sh);
+        #   craneLib = flake.lib.holochainCraneLib { inherit system; };
+        #   zomeDeps = flake.lib.zomeCargoDeps { inherit craneLib; };
+        # in pkgs.mkShell {
+        #   packages = [ configureCargoVendoredDepsHook inheritCargoArtifacts ];
+
+        #   shellHook = ''
+        #     cargoVendorDir=${zomeDeps.cargoVendorDir} configureCargoVendoredDeps
+        #     cargoArtifacts=${zomeDeps.cargoArtifacts} inheritCargoArtifacts
+        #   '';
+        # };
+
+        # devShells.sweettestDev = let
+        #   configureCargoVendoredDepsHook =
+        #     pkgs.writeShellScriptBin "configureCargoVendoredDeps"
+        #     (builtins.readFile ./nix/configureCargoVendoredDepsHook.sh);
+        #   inheritCargoArtifacts =
+        #     pkgs.writeShellScriptBin "inheritCargoArtifacts"
+        #     (builtins.readFile ./nix/inheritCargoArtifacts.sh);
+        #   craneLib = flake.lib.holochainCraneLib { inherit system; };
+        #   holochainDeps =
+        #     pkgs.callPackage flake.lib.holochainCargoDeps { inherit craneLib; };
+        # in pkgs.mkShell {
+        #   packages = [ configureCargoVendoredDepsHook inheritCargoArtifacts ];
+
+        #   shellHook = ''
+        #     cargoVendorDir=${holochainDeps.cargoVendorDir} configureCargoVendoredDeps
+        #     cargoArtifacts=${holochainDeps.cargoArtifacts} inheritCargoArtifacts
+        #   '';
+        # };
 
         packages.sync-npm-git-dependencies-with-nix = let
           craneLib = inputs.crane.mkLib pkgs;

diff --git a/nix/buildDepsOnlyWithArtifacts.nix b/nix/buildDepsOnlyWithArtifacts.nix
diff --git a/nix/fixtures/module-repo/flake.lock b/nix/fixtures/module-repo/flake.lock
diff --git a/nix/zome.nix b/nix/zome.nix
@@ -1,43 +1,32 @@
-{ pkgs, runCommandLocal, runCommandNoCC, binaryen, deterministicCraneLib
-, craneLib, workspacePath, crateCargoToml, zomeCargoDeps }:
+{ zomeCargoArtifacts, pkgs, runCommandLocal, runCommandNoCC, binaryen
+, deterministicCraneLib, craneLib, workspacePath, crateCargoToml }:
 
 let
   cargoToml = builtins.fromTOML (builtins.readFile crateCargoToml);
   crate = cargoToml.package.name;
 
+  src = craneLib.cleanCargoSource (craneLib.path workspacePath);
   commonArgs = {
-    strictDeps = true;
     doCheck = false;
-    src = craneLib.cleanCargoSource (craneLib.path workspacePath);
+    inherit src;
     CARGO_BUILD_TARGET = "wasm32-unknown-unknown";
-    cargoLock = workspacePath + /Cargo.lock;
-  };
-
-  cargoArtifacts = (craneLib.callPackage ./buildDepsOnlyWithArtifacts.nix { })
-    (commonArgs // {
-      pname = crate;
-      version = "deps";
-
-      # cargoVendorDir = (zomeCargoDeps { inherit craneLib; }).cargoVendorDir;
-      cargoArtifacts = (zomeCargoDeps { inherit craneLib; }).cargoArtifacts;
-    });
-
-  buildPackageCommonArgs = commonArgs // {
     cargoExtraArgs = "-p ${crate} --locked";
     pname = crate;
     version = cargoToml.package.version;
     cargoToml = crateCargoToml;
+    cargoLock = workspacePath + /Cargo.lock;
   };
 
-  wasm = craneLib.buildPackage
-    (buildPackageCommonArgs // { inherit cargoArtifacts; });
+  wasm = craneLib.buildPackage (commonArgs // {
+    cargoArtifacts = zomeCargoArtifacts { inherit craneLib src; };
+  });
 
   deterministicWasm = let
     wasm = deterministicCraneLib.buildPackage (commonArgs // {
-      cargoArtifacts =
-        (zomeCargoDeps { craneLib = deterministicCraneLib; }).cargoArtifacts;
-      cargoVendorDir =
-        (zomeCargoDeps { craneLib = deterministicCraneLib; }).cargoVendorDir;
+      cargoArtifacts = zomeCargoArtifacts {
+        inherit src;
+        craneLib = deterministicCraneLib;
+      };
     });
   in runCommandLocal "${crate}-deterministic" {
     meta = { holochainPackageType = "zome"; };