Merge pull request #201 from mlabs-haskell/szg251/fix-lbf-plutus-rust-bug

Fix bug with lbfPlutusRust not generating Json and Eq instances

Author: szg251

.envrc

@@ -1,2 +1 @@
-nix_direnv_watch_file ./pre-commit.nix
 use flake .#default

extras/lbf-nix/lbf-plutus-rust.nix

@@ -3,23 +3,22 @@ pkgs: lbf: lbg-rust: lbfRustOpts:
 let
   utils = import ./utils.nix pkgs;
 
-  lbfRust = import ./lbf-rust.nix pkgs lbf lbg-rust;
+  lbfRust = import ./lbf-prelude-rust.nix pkgs lbf lbg-rust;
   lbfRustOptsForPlutus = utils.overrideAttrs
     {
       imports = {
         default = { };
         override = libs: libs // {
-          lbf-prelude = ../../libs/lbf-prelude;
           lbf-plutus = ../../libs/lbf-plutus;
         };
       };
       classes = {
         default = [ ];
-        override = cls: cls ++ [ "Prelude.Eq" "Plutus.V1.PlutusData" ];
+        override = cls: cls ++ [ "Plutus.V1.PlutusData" ];
       };
       configs = {
         default = [ ];
-        override = _: [ ../../lambda-buffers-codegen/data/rust-prelude-base.json ../../lambda-buffers-codegen/data/rust-plutus-pla.json ];
+        override = cfgs: cfgs ++ [ ../../lambda-buffers-codegen/data/rust-plutus-pla.json ];
       };
     }
     lbfRustOpts;

extras/lbf-nix/lbf-plutus-typescript.nix

@@ -9,13 +9,12 @@ lbfTypescriptOpts:
 let
   utils = import ./utils.nix pkgs;
 
-  lbfTypescript = import ./lbf-typescript.nix { inherit pkgs lbf lbg-typescript typescriptFlake; };
+  lbfTypescript = import ./lbf-prelude-typescript.nix { inherit pkgs lbf lbg-typescript config typescriptFlake; };
   lbfTypescriptOptsForPlutus = utils.overrideAttrs
     {
       imports = {
         default = { };
         override = libs: libs // {
-          lbf-prelude = "${config.packages.lbf-prelude}";
           lbf-plutus = "${config.packages.lbf-plutus}";
         };
       };
@@ -27,14 +26,11 @@ let
       };
       classes = {
         default = [ ];
-        override = cls: cls ++ [ "Prelude.Eq" "Prelude.Json" "Plutus.V1.PlutusData" ];
+        override = cls: cls ++ [ "Plutus.V1.PlutusData" ];
       };
       configs = {
         default = [ ];
-        override = _: [
-          "${config.packages.codegen-configs}/typescript-prelude-base.json"
-          "${config.packages.codegen-configs}/typescript-plutus.json"
-        ];
+        override = cfgs: cfgs ++ [ "${config.packages.codegen-configs}/typescript-plutus.json" ];
       };
     }
     lbfTypescriptOpts;

runtimes/rust/lbr-prelude-derive/.envrc

@@ -1,2 +1,2 @@
-nix_direnv_watch_file ./build.nix
+watch_file ./build.nix
 use flake ../../..#dev-lbr-prelude-derive-rust

runtimes/rust/lbr-prelude/.envrc

@@ -1,2 +1,2 @@
-nix_direnv_watch_file ./build.nix
+watch_file ./build.nix
 use flake ../../..#dev-lbr-prelude-rust

testsuites/lbt-plutus/lbt-plutus-rust/.envrc

@@ -1,2 +1 @@
-nix_direnv_watch_file build.json
 use flake ../../..#dev-lbt-plutus-rust

testsuites/lbt-plutus/lbt-plutus-typescript/.envrc

@@ -0,0 +1 @@
+use flake ../../..#lbt-plutus-typescript

testsuites/lbt-prelude/lbt-prelude-rust/.envrc

@@ -1,2 +1 @@
-nix_direnv_watch_file build.json
 use flake ../../..#dev-lbt-prelude-rust

testsuites/lbt-prelude/lbt-prelude-typescript/.envrc

@@ -0,0 +1 @@
+use flake ../../..#lbt-prelude-typescript