Merge branch 'master' into SCP-2858-chain-index-securityParam

IntersectMBO · Oct 12, 2021 · 69a37a8 · 69a37a8
2 parents 5c68d7d + 1f20481
commit 69a37a8
Show file tree

Hide file tree

Showing 66 changed files with 11,089 additions and 8,385 deletions.
diff --git a/nix/pkgs/haskell/haskell.nix b/nix/pkgs/haskell/haskell.nix
@@ -220,6 +220,8 @@ let
             platforms = lib.platforms.linux;
           };
 
+          # FIXME: This is failing mysteriouly on Hydra, perhaps with a sercret OOM :(
+          plutus-playyground-server.components.tests.plutus-playground-server-test.doCheck = false;
 
           # Broken due to warnings, unclear why the setting that fixes this for the build doesn't work here.
           iohk-monitoring.doHaddock = false;

diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-benchmark.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-benchmark.nix
diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix
diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx-plugin.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx-plugin.nix
diff --git a/nix/pkgs/haskell/materialized-darwin/default.nix b/nix/pkgs/haskell/materialized-darwin/default.nix
diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-benchmark.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-benchmark.nix
diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix
diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx-plugin.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx-plugin.nix
diff --git a/nix/pkgs/haskell/materialized-linux/default.nix b/nix/pkgs/haskell/materialized-linux/default.nix
diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-benchmark.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-benchmark.nix
diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix