From 697a7a2a9754532df48541f3dd0fe7cc90f38d27 Mon Sep 17 00:00:00 2001 From: Hans Larsen Date: Tue, 15 Sep 2020 15:45:07 -0700 Subject: [PATCH 1/7] Revert "rm nix/agent-js/agent-js.nix, which is not used by anything" This reverts commit fc3de2b082461338e9fa770c81d31eb6acac714d. --- default.nix | 1 + nix/agent-js/agent-js.nix | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 nix/agent-js/agent-js.nix diff --git a/default.nix b/default.nix index 685c866c30..9a61398dc7 100644 --- a/default.nix +++ b/default.nix @@ -14,6 +14,7 @@ rec { # Agents in varous languages agent-js-monorepo = pkgs.agent-js-monorepo; + agent-js = import ./nix/agent-js/agent-js.nix { inherit system pkgs; }; # Bootstrap frontend. bootstrap-js = import ./nix/agent-js/bootstrap-js.nix { inherit system pkgs; }; diff --git a/nix/agent-js/agent-js.nix b/nix/agent-js/agent-js.nix new file mode 100644 index 0000000000..6c334fb836 --- /dev/null +++ b/nix/agent-js/agent-js.nix @@ -0,0 +1,29 @@ +{ pkgs ? import ../. { inherit system; }, system ? builtins.currentSystem }: +pkgs.stdenv.mkDerivation { + name = "agent-js-monorepo-package-agent"; + src = "${pkgs.agent-js-monorepo}"; + outputs = [ + "out" + "lib" + ]; + buildInputs = [ + pkgs.nodejs + pkgs.agent-js-monorepo + ]; + configurePhase = '' + export HOME=$(mktemp -d) + ''; + installPhase = '' + # $out: everything + mkdir -p $out + cp -R ${pkgs.agent-js-monorepo.agent}/* $out/ + + # $lib/node_modules: node_modules dir that must be resolvable by npm + # for future build steps to work (e.g. at ../../node_modules) + mkdir -p $lib + agent_node_modules="${pkgs.agent-js-monorepo}/packages/agent/node_modules" + if test -d "$agent_node_modules"; then + cp -R "$agent_node_modules" $lib; + fi + ''; +} From fba063e078d270728c403470cb5c77f18a5e6caa Mon Sep 17 00:00:00 2001 From: Benjamin Goering Date: Tue, 15 Sep 2020 16:53:46 -0700 Subject: [PATCH 2/7] update niv agent-js-monorepo ref 87626f7 --- nix/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index d00dd378d9..e79bc7c364 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -15,7 +15,7 @@ "agent-js-monorepo": { "ref": "next", "repo": "ssh://git@github.com/dfinity-lab/agent-js", - "rev": "ccea79546e273892041b3863cf7a5e4ad51c2f07", + "rev": "87626f7a7820358143eeb0e4defa223396632923", "type": "git" }, "bats-support": { @@ -44,9 +44,9 @@ "type": "git" }, "ic-ref": { + "branch": "release-0.10", "repo": "ssh://git@github.com/dfinity-lab/ic-ref", "rev": "7d453c4b09f78b3fa1f06df6a3ff00e51b11ca3e", - "branch": "release-0.10", "type": "git" }, "motoko": { From 9770333bc181dbde652654373aa63e8e5dc25fd8 Mon Sep 17 00:00:00 2001 From: Benjamin Goering Date: Tue, 15 Sep 2020 16:54:23 -0700 Subject: [PATCH 3/7] nix/agent-js/agent-js.nix does npm pack --- nix/agent-js/agent-js.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nix/agent-js/agent-js.nix b/nix/agent-js/agent-js.nix index 6c334fb836..7f7e844163 100644 --- a/nix/agent-js/agent-js.nix +++ b/nix/agent-js/agent-js.nix @@ -13,10 +13,17 @@ pkgs.stdenv.mkDerivation { configurePhase = '' export HOME=$(mktemp -d) ''; + buildPhase = '' + cd packages/agent + echo "calling npm pack" + npm pack + cd - + ''; installPhase = '' # $out: everything mkdir -p $out cp -R ${pkgs.agent-js-monorepo.agent}/* $out/ + cp -R packages/agent/dfinity-agent*.tgz $out/ # $lib/node_modules: node_modules dir that must be resolvable by npm # for future build steps to work (e.g. at ../../node_modules) @@ -25,5 +32,6 @@ pkgs.stdenv.mkDerivation { if test -d "$agent_node_modules"; then cp -R "$agent_node_modules" $lib; fi + ''; } From 36d8da59e9993a9a36f53fc45df0d259d4dad12f Mon Sep 17 00:00:00 2001 From: Benjamin Goering Date: Tue, 15 Sep 2020 17:10:44 -0700 Subject: [PATCH 4/7] niv update agent-js-monorepo --- nix/sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/sources.json b/nix/sources.json index e79bc7c364..1adaebfc2d 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -15,7 +15,7 @@ "agent-js-monorepo": { "ref": "next", "repo": "ssh://git@github.com/dfinity-lab/agent-js", - "rev": "87626f7a7820358143eeb0e4defa223396632923", + "rev": "ea78f83722d4f7a8b2a56edb67cfc642b29ec3a5", "type": "git" }, "bats-support": { From 7fb5b2fb8287e16f7743a0ca78149c483a8d8f1d Mon Sep 17 00:00:00 2001 From: Benjamin Goering Date: Tue, 15 Sep 2020 18:02:50 -0700 Subject: [PATCH 5/7] niv update agent-js-monorepo --- nix/sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/sources.json b/nix/sources.json index 1adaebfc2d..3597c76220 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -15,7 +15,7 @@ "agent-js-monorepo": { "ref": "next", "repo": "ssh://git@github.com/dfinity-lab/agent-js", - "rev": "ea78f83722d4f7a8b2a56edb67cfc642b29ec3a5", + "rev": "cfd8107c1a047dac8f46756f97b63d56d30c1884", "type": "git" }, "bats-support": { From 0e7078d07a8aabf137654bf8eb03b4c8dd4dd521 Mon Sep 17 00:00:00 2001 From: Benjamin Goering Date: Tue, 15 Sep 2020 18:27:24 -0700 Subject: [PATCH 6/7] niv update agent-js-monorepo --- nix/sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/sources.json b/nix/sources.json index 3597c76220..3b046eba8e 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -15,7 +15,7 @@ "agent-js-monorepo": { "ref": "next", "repo": "ssh://git@github.com/dfinity-lab/agent-js", - "rev": "cfd8107c1a047dac8f46756f97b63d56d30c1884", + "rev": "6bbd57c2db5dc6a90bb59115d4f133b3520f43d7", "type": "git" }, "bats-support": { From 41c1058264041560a1bfad3f2325590dca644318 Mon Sep 17 00:00:00 2001 From: Benjamin Goering Date: Tue, 15 Sep 2020 18:59:32 -0700 Subject: [PATCH 7/7] niv update agent-js-monorepo --- nix/sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/sources.json b/nix/sources.json index 3b046eba8e..5611da96af 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -15,7 +15,7 @@ "agent-js-monorepo": { "ref": "next", "repo": "ssh://git@github.com/dfinity-lab/agent-js", - "rev": "6bbd57c2db5dc6a90bb59115d4f133b3520f43d7", + "rev": "6caaa829bd7a98e3ed182351f5e1fa744718a3fa", "type": "git" }, "bats-support": {