From b7b19687f291e2931ab0294143fc518e19ce24b8 Mon Sep 17 00:00:00 2001 From: Walker Date: Sat, 25 Feb 2023 19:18:03 -0300 Subject: [PATCH] fix(ctl-full): missing node_modules on purs-nix compile --- ctl-full/flake.lock | 29 ++++++----------------------- ctl-full/flake.nix | 7 ------- ctl-full/package.json | 3 +-- 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/ctl-full/flake.lock b/ctl-full/flake.lock index 952f146..c6bb4a7 100644 --- a/ctl-full/flake.lock +++ b/ctl-full/flake.lock @@ -2165,11 +2165,11 @@ "utils": "utils_21" }, "locked": { - "lastModified": 1676662563, - "narHash": "sha256-O0vv24b2MOKzQ2fVxXNIw5Sr17VRzjSO+TEU6gNtaLg=", + "lastModified": 1677363292, + "narHash": "sha256-HuA+wk4w75seU1DvSxJC4ZQef/4QhNFGM/CKU418p/s=", "owner": "LovelaceAcademy", "repo": "ctl-nix", - "rev": "6a61510d1b571809630ce6af088bd427a1fd4218", + "rev": "6f6e185211ca22705e9f8d18caa037f593769226", "type": "github" }, "original": { @@ -9615,22 +9615,6 @@ "type": "github" } }, - "npmlock2nix_2": { - "flake": false, - "locked": { - "lastModified": 1673447413, - "narHash": "sha256-sJM82Sj8yfQYs9axEmGZ9Evzdv/kDcI9sddqJ45frrU=", - "owner": "nix-community", - "repo": "npmlock2nix", - "rev": "9197bbf397d76059a76310523d45df10d2e4ca81", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "npmlock2nix", - "type": "github" - } - }, "ogmios": { "inputs": { "CHaP": "CHaP", @@ -10422,11 +10406,11 @@ "utils": "utils_20" }, "locked": { - "lastModified": 1676585554, - "narHash": "sha256-lTI8W1uHB8iOkk4QbFz/yeh4UmYWqzq0cW+0Da15qg8=", + "lastModified": 1677362568, + "narHash": "sha256-VeK7497idJjV/6q+cjNMWrROaitRScUzwjvsxYA18Yk=", "owner": "LovelaceAcademy", "repo": "purs-nix", - "rev": "c3e19fd6a78c83806221e906860cb71d3ff55652", + "rev": "78c4007f84923dc1191a86ab136db5ccd98a9f02", "type": "github" }, "original": { @@ -10443,7 +10427,6 @@ "ctl-nix", "nixpkgs" ], - "npmlock2nix": "npmlock2nix_2", "purs-nix": [ "ctl-nix", "purs-nix" diff --git a/ctl-full/flake.nix b/ctl-full/flake.nix index d8340c1..63d8e7e 100644 --- a/ctl-full/flake.nix +++ b/ctl-full/flake.nix @@ -4,8 +4,6 @@ nixpkgs.follows = "ctl-nix/nixpkgs"; purs-nix.follows = "ctl-nix/purs-nix"; utils.url = "github:ursi/flake-utils"; - npmlock2nix.url = "github:nix-community/npmlock2nix"; - npmlock2nix.flake = false; }; outputs = { self, utils, ... }@inputs: @@ -35,8 +33,6 @@ inherit system; overlays = [ ctl-nix ]; }; - npmlock2nix = import inputs.npmlock2nix { inherit pkgs; }; - node_modules = npmlock2nix.v1.node_modules { src = ./.; } + /node_modules; ps = purs-nix.purs { purescript = purs; @@ -48,9 +44,6 @@ [ cardano-transaction-lib ]; - # FFI dependencies - # TODO Affjax FFI should be in ctl-nix - foreign.Affjax.node_modules = node_modules; }; ps-command = ps.command { }; prebuilt = (pkgs.arion.build { diff --git a/ctl-full/package.json b/ctl-full/package.json index 96af802..46bb06c 100644 --- a/ctl-full/package.json +++ b/ctl-full/package.json @@ -4,7 +4,6 @@ "node-polyfill-webpack-plugin": "^1.1.4", "webpack": "^5.67.0", "webpack-cli": "^4.10.0", - "webpack-dev-server": "^4.7.4", - "xhr2": "^0.2.1" + "webpack-dev-server": "^4.7.4" } }