fix: missing node_modules on ffi folders

LovelaceAcademy · Jan 31, 2023 · 5b94fbb · 5b94fbb
1 parent 03d03f4
commit 5b94fbb
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/nix/purs-nix/custom-deps.nix b/nix/purs-nix/custom-deps.nix
@@ -209,7 +209,6 @@ package-set-repo: inputs: pkgs: npmlock2nix: self: super: with self; {
       inherit (inputs.bignumber) rev;
     };
     info = {
-      version = "1.0.0";
       dependencies = [
         console
         effect
@@ -229,7 +228,11 @@ package-set-repo: inputs: pkgs: npmlock2nix: self: super: with self; {
           ffi = [
             "Data.BigNumber"
           ];
-          node_modules = npmlock2nix.v1.node_modules { src = inputs.bignumber; } + /node_modules;
+          node_modules = npmlock2nix.v1.node_modules
+            {
+              pname = "bignumber-node_modules-" + inputs.bignumber.shortRev;
+              src = inputs.bignumber;
+            } + /node_modules;
         in
         pkgs.lib.attrsets.genAttrs ffi (_: { inherit node_modules; });
     };
@@ -369,7 +372,7 @@ package-set-repo: inputs: pkgs: npmlock2nix: self: super: with self; {
       foreign =
         let
           p = pkgs.mkYarnModules {
-            pname = "purescript-toppokki-node_modules";
+            pname = "toppokki-node_modules";
             version = inputs.toppokki.shortRev;
             yarnLock = inputs.toppokki + /yarn.lock;
             packageJSON = inputs.toppokki + /package.json;
@@ -405,15 +408,18 @@ package-set-repo: inputs: pkgs: npmlock2nix: self: super: with self; {
           uint
           # /endworkaround
         ];
-
       foreign =
         let
           ffi = [
             "Noble.Secp256k1.ECDSA"
             "Noble.Secp256k1.Schnorr"
             "Noble.Secp256k1.Utils"
           ];
-          node_modules = npmlock2nix.v1.node_modules { src = inputs.noble-secp256k1; } + /node_modules;
+          node_modules = npmlock2nix.v1.node_modules
+            {
+              pname = "noble-secp256k1-node_modules-" + inputs.noble-secp256k1.shortRev;
+              src = inputs.noble-secp256k1;
+            } + /node_modules;
         in
         pkgs.lib.attrsets.genAttrs ffi (_: { inherit node_modules; });
     };
@@ -437,7 +443,10 @@ package-set-repo: inputs: pkgs: npmlock2nix: self: super: with self; {
             "Data.BigInt"
           ];
           node_modules = npmlock2nix.v1.node_modules
-            { src = inputs.bigints; } + /node_modules;
+            {
+              pname = "bigints-node_modules-" + inputs.bigints.shortRev;
+              src = inputs.bigints;
+            } + /node_modules;
         in
         pkgs.lib.attrsets.genAttrs ffi (_: { inherit node_modules; });
     };