V3 update

dev-net/build.nix

@@ -1,14 +1,20 @@
-{ flake-parts-lib
-, self
-, withSystem
-, lib
-, ...
-}: {
-  perSystem = { pkgs, system, ... }: lib.mkIf (system == "x86_64-linux") {
-    checks.dev-net-nixos-test = pkgs.nixosTest (import ./test.nix {
-      inherit flake-parts-lib self withSystem;
-    });
-  };
+{
+  flake-parts-lib,
+  self,
+  withSystem,
+  lib,
+  ...
+}:
+{
+  perSystem =
+    { pkgs, system, ... }:
+    lib.mkIf (system == "x86_64-linux") {
+      checks.dev-net-nixos-test = pkgs.nixosTest (
+        import ./test.nix {
+          inherit flake-parts-lib self withSystem;
+        }
+      );
+    };
 
   flake = {
     nixosModules.dev-net = import ./cardano-dev-net.nix {

dev-net/cardano-dev-net.nix

@@ -1,10 +1,17 @@
-_: { lib
-   , config
-   , pkgs
-   , ...
-   }:
+_:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 let
-  inherit (lib) mkOption types mkEnableOption mkIf;
+  inherit (lib)
+    mkOption
+    types
+    mkEnableOption
+    mkIf
+    ;
   inherit (builtins) toString;
 
   cfg = config.services.cardano-dev-net;

dev-net/test.nix

@@ -1,46 +1,54 @@
-{ self, ... }: {
+{ self, ... }:
+{
   name = "Test Cardano Dev Net";
 
   nodes =
     let
       # TODO(chfanghr): this *is* a nixosTest attribute in the new version of nixpkgs
-      defaults = { config, pkgs, lib, ... }: {
-        imports = [
-          self.inputs.cardano-nix.nixosModules.default
-          self.outputs.nixosModules.dev-net
-        ];
+      defaults =
+        {
+          config,
+          pkgs,
+          lib,
+          ...
+        }:
+        {
+          imports = [
+            self.inputs.cardano-nix.nixosModules.default
+            self.outputs.nixosModules.dev-net
+          ];
 
-        services = {
-          cardano-dev-net.enable = true;
-          ogmios = {
-            enable = true;
-            nodeSocketPath = config.services.cardano-dev-net.socketPath;
-            nodeConfigPath = config.services.cardano-dev-net.dynamicConfigFile;
+          services = {
+            cardano-dev-net.enable = true;
+            ogmios = {
+              enable = true;
+              nodeSocketPath = config.services.cardano-dev-net.socketPath;
+              nodeConfigPath = config.services.cardano-dev-net.dynamicConfigFile;
+            };
           };
-        };
 
-        systemd.services.ogmios =
-          let
-            waitForOgmios = pkgs.writeShellScript "wait-for-ogmios" ''
-              function is-listening {
-                ${lib.getExe' pkgs.iproute2 "ss"} \
-                  --no-header \
-                  --numeric \
-                  --listening \
-                  --tcp src = ${config.services.ogmios.host} and sport = inet:${toString config.services.ogmios.port} | grep LISTEN
-              }
+          systemd.services.ogmios =
+            let
+              waitForOgmios = pkgs.writeShellScript "wait-for-ogmios" ''
+                function is-listening {
+                  ${lib.getExe' pkgs.iproute2 "ss"} \
+                    --no-header \
+                    --numeric \
+                    --listening \
+                    --tcp src = ${config.services.ogmios.host} and sport = inet:${toString config.services.ogmios.port} | grep LISTEN
+                }
 
-              until is-listening; do sleep 10; done
-            '';
-          in
-          {
-            after = [ "cardano-node-socket.service" ];
-            serviceConfig.RestrictAddressFamilies = [ "AF_NETLINK" ];
-            postStart = ''
-              timeout 60 ${waitForOgmios}
-            '';
-          };
-      };
+                until is-listening; do sleep 10; done
+              '';
+            in
+            {
+              after = [ "cardano-node-socket.service" ];
+              serviceConfig.RestrictAddressFamilies = [ "AF_NETLINK" ];
+              postStart = ''
+                timeout 60 ${waitForOgmios}
+              '';
+            };
+        };
     in
     {
       machineWithNetworkMagic42 = {

extras/diesel-derive-pg/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "diesel-derive-pg"
-version = "0.1.0"
+version = "1.0.0"
 edition = "2021"
 license = "Apache-2.0"
 description = "Derive ToSql and FromSql trait implementations for Postgres custom types"
@@ -11,9 +11,9 @@ proc-macro = true
 
 [dependencies]
 deluxe = "0.5.0"
-proc-macro2 = "1.0.86"
-quote = "1.0.37"
-syn = "2.0.77"
+proc-macro2 = "1.0.92"
+quote = "1.0.38"
+syn = "2.0.95"
 
 [dev-dependencies]
-diesel = { version = "2.2.4", features = ["postgres"] }
+diesel = { version = "2.2.6", features = ["postgres"] }

extras/diesel-derive-pg/build.nix

@@ -1,17 +1,24 @@
-{ inputs, ... }: {
-  perSystem = { system, pkgs, config, ... }:
+{ inputs, ... }:
+{
+  perSystem =
+    {
+      system,
+      pkgs,
+      config,
+      ...
+    }:
     let
-      rustFlake =
-        inputs.flake-lang.lib.${system}.rustFlake {
-          src = ./.;
-          crateName = "diesel-derive-pg";
+      rustFlake = inputs.flake-lang.lib.${system}.rustFlake {
+        src = ./.;
+        crateName = "diesel-derive-pg";
+        runTests = false;
 
-          buildInputs = [ pkgs.postgresql.lib ];
+        buildInputs = [ pkgs.postgresql.lib ];
 
-          devShellHook = config.settings.shell.hook;
+        devShellHook = config.settings.shell.hook;
 
-          generateDocs = false;
-        };
+        generateDocs = false;
+      };
     in
     {
       inherit (rustFlake) packages checks devShells;

extras/tx-bakery-testsuite/api/Demo/Config.lbf

@@ -9,6 +9,7 @@ derive Json Script
 
 record Config = {
   eqValidator : Script,
+  eqValidatorV2 : Script,
   mintingPolicy : Script,
   refInputMintingPolicy : Script
 }

extras/tx-bakery-testsuite/api/Demo/Plutus.lbf

@@ -3,7 +3,8 @@ module Demo.Plutus
 
 import Prelude
 import qualified Plutus.V1 as Plutus
-import Plutus.V1 (PlutusData, AssetClass, Address, TxOutRef)
+import Plutus.V1 (PlutusData, AssetClass, Address)
+import Plutus.V3 (TxOutRef)
 
 record Record a = {
   foo : AssetClass,

extras/tx-bakery-testsuite/api/build.nix

@@ -1,5 +1,7 @@
-{ inputs, ... }: {
-  perSystem = { system, ... }:
+{ inputs, ... }:
+{
+  perSystem =
+    { system, ... }:
     {
       packages = {
         lbf-tx-bakery-tests-plutus-api-plutarch = inputs.lbf.lib."${system}".lbfPlutarch {
@@ -28,4 +30,3 @@
       };
     };
 }
-

extras/tx-bakery-testsuite/tests/.envrc

@@ -1 +1 @@
-use flake .#dev-tx-bakery-tests-rust
+use flake .#dev-tx-bakery-testsuite-rust