Merge branch 'main' into szg251/prepare-for-publish

Author: szg251

experimental/build.nix

@@ -18,8 +18,9 @@ _: {
 
           pkgs.protobuf
           pkgs.haskellPackages.haskell-language-server
-          pkgs.swiPrologWithGui
-        ] ++ config.settings.shell.tools;
+        ]
+        ++ (pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.swiPrologWithGui ])
+        ++ config.settings.shell.tools;
 
         shellHook = config.settings.shell.hook;
         inputsFrom = [ inputs'.proto-nix.devShells.dev-proto-nix ];

extras/haskell.nix/plutus.nix

@@ -40,7 +40,7 @@ let
     # FIXME: contentAddressed = true;
     reinstallableLibGhc = false; # See https://github.com/input-output-hk/haskell.nix/issues/1939
     packages = {
-      cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf pkgs.secp256k1 ] ];
+      cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf pkgs.secp256k1 pkgs.libblst ] ];
       cardano-crypto-praos.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf ] ];
     };
   };

extras/pre-commit-hooks-extra.nix

@@ -2,10 +2,10 @@
   imports = [
     inputs.pre-commit-hooks.flakeModule # Adds perSystem.pre-commit options
   ];
-  perSystem = { pkgs, ... }:
+  perSystem = { pkgsForRust, ... }:
     let
-      inherit (pkgs.rust-bin.stable.latest) rustfmt;
-      inherit (pkgs) deno;
+      inherit (pkgsForRust.rust-bin.stable.latest) rustfmt;
+      inherit (pkgsForRust) deno;
     in
     {
       pre-commit.settings.hooks = {