Merge remote-tracking branch 'origin/main' into jared/follow-flake-lang-as-much-as-possible

Author: jared

.envrc

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

docs/syntax.md

@@ -181,7 +181,7 @@ A class definition introduces a new class.
 
 ```text
 classdef       -> 'class' [ constraintexps '<=' ] classname { varname }
-constraintexp  -> classref { varname }
+constraintexp  -> longclassname { varname }
                 | '(' constraintexps ')'
 constraintexps -> [ constraintexp { ',' constraintexp } ]
 ```
@@ -194,7 +194,7 @@ An instance clause specifies a type is an instance of a class.
 
 ```text
 instanceclause -> 'instance'  constraint [ ':-' constraintexps ]
-constraint     -> classref { typeexp }
+constraint     -> longclassname { typeexp }
 ```
 
 Instance clauses do not instruct the code generator to generate code, but instead instructs the compiler (semantic checking) that the target language environment provides type class implementations for the given type (provided that the given `constraintexps` also have implementations).
@@ -243,12 +243,12 @@ field         -> fieldname ':' prod
 opaquetypedef -> 'opaque' typename { varname }
 
 classdef       -> 'class' [ constraintexps '<=' ] classname { varname }
-constraintexp  -> classref { varname }
+constraintexp  -> longclassname { varname }
                 | '(' constraintexps ')'
 constraintexps -> [ constraintexp { ',' constraintexp } ]
 
 instanceclause -> 'instance'  constraint [ ':-' constraintexps ]
-constraint     -> classref { typeexp }
+constraint     -> longclassname { typeexp }
 
 deriveclause -> 'derive' constraint
 ```

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;