Merge commit 'b906c8be14c19432108272f158f1dc2752aaa8c5' into hls-flake-fix

Author: shlevy

.gitattributes

@@ -2,3 +2,4 @@
 nix/pkgs/haskell/materialized*/**/*.nix linguist-generated=true
 # linguist gets confused by PIR files, and thinks they make up a lot of our source!
 *.pir linguist-detectable=false
+stubs/plutus-ghc-stub/** linguist-vendored=true

cabal.project

@@ -27,6 +27,7 @@ packages: doc
           quickcheck-dynamic
           web-ghc
           word-array
+          stubs/plutus-ghc-stub
 
 -- We never, ever, want this.
 write-ghc-environment-files: never
@@ -72,10 +73,6 @@ package ouroboros-consensus-cardano
 package cardano-api
   optimization: False
 
--- Turn off the tests for a while
-package plutus-metatheory
-  tests: False
-
 -- https://github.com/Quid2/flat/pull/22 fixes a potential exception
 -- when decoding invalid (e.g. malicious) text literals.
 source-repository-package
@@ -108,12 +105,12 @@ source-repository-package
     base-deriving-via
     binary
     binary/test
-    measures
-    orphans-deriving-via
-    slotting
     cardano-crypto-class
     cardano-crypto-praos
     cardano-crypto-tests
+    measures
+    orphans-deriving-via
+    slotting
     strict-containers
 
 source-repository-package
@@ -127,7 +124,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: f149c1c1e4e4bb5bab51fa055e9e3a7084ddc30e
+  tag: 877ce057ff6fb086474c8eaad53f2b7f0e0fce6b
   subdir:
     monoidal-synchronisation
     typed-protocols
@@ -146,7 +143,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 34abfb7f4f5610cabb45396e0496472446a0b2ca
+  tag: 808724ff8a19a33d0ed06f9ef59fbd900b08553c
   subdir:
     iohk-monitoring
     tracer-transformers
@@ -160,7 +157,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 12a0ef69d64a55e737fbf4e846bd8ed9fb30a956
+  tag: d5b184a820853c7ba202efd615b8fadca1acb52c
   subdir:
     byron/chain/executable-spec
     byron/crypto
@@ -183,7 +180,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node.git
-  tag: 3a56ac245c83d3345f81123ec3bb496bb23477a3
+  tag: ed11e8b6429d4af1cb2539460e5cb2283a06b2dc
   subdir:
     cardano-api
     cardano-node

ci.nix

@@ -11,6 +11,9 @@ let
   # limit supportedSystems to what the CI can actually build
   # currently that is linux and darwin.
   systems = filterSystems supportedSystems;
+  crossSystems =
+    let pkgs = (import ./default.nix { }).pkgs;
+    in { inherit (pkgs.lib.systems.examples) mingwW64; };
 
   # Collects haskell derivations and builds an attrset:
   #
@@ -49,18 +52,30 @@ let
   mkSystemDimension = systems:
     let
       # given a system ("x86_64-linux") return an attrset of derivations to build
-      select = _: system:
+      _select = _: system: crossSystem:
         let
-          packages = import ./default.nix { inherit system checkMaterialization; };
+          packages = import ./default.nix { inherit system crossSystem checkMaterialization; };
           pkgs = packages.pkgs;
           plutus = packages.plutus;
-          isBuildable = platformFilterGeneric pkgs system;
+          # Map `crossSystem.config` to a name used in `lib.platforms`
+          platformString =
+            if crossSystem == null then system
+            else if crossSystem.config == "x86_64-w64-mingw32" then "x86_64-windows"
+            else crossSystem.config;
+          isBuildable = platformFilterGeneric pkgs platformString;
+          filterCross = x:
+            if crossSystem == null
+            then x
+            else {
+              # When cross compiling only include haskell for now
+              inherit (x) haskell;
+            };
         in
         filterAttrsOnlyRecursive (_: drv: isBuildable drv) ({
           # The haskell.nix IFD roots for the Haskell project. We include these so they won't be GCd and will be in the
           # cache for users
           inherit (plutus.haskell.project) roots;
-        } // pkgs.lib.optionalAttrs (!rootsOnly) {
+        } // pkgs.lib.optionalAttrs (!rootsOnly) (filterCross {
           # build relevant top level attributes from default.nix
           inherit (packages) docs tests plutus-playground marlowe-playground marlowe-dashboard marlowe-dashboard-fake-pab plutus-pab plutus-use-cases deployment;
 
@@ -78,8 +93,9 @@ let
 
           # build all haskell packages and tests
           haskell = pkgs.recurseIntoAttrs (mkHaskellDimension pkgs plutus.haskell.projectPackages);
-        });
+        }));
     in
-    dimension "System" systems select;
+    dimension "System" systems (name: sys: _select name sys null)
+    // dimension "Cross System" crossSystems (name: crossSys: _select name "x86_64-linux" crossSys);
 in
 mkSystemDimension systems

deployment/morph/default.nix

@@ -30,7 +30,7 @@ let
   # in a `pkgs.nixos` call to build the machine outside of morph.
   mkMachine = pkgs.callPackage ./mk-machine.nix { inherit plutus tfinfo; extraImports = [ fakeDeploymentOption ]; };
   buildMachine = { config, name }: (pkgs.nixos (mkMachine { inherit config name; })).toplevel;
-  linuxOnly = x: if pkgs.stdenv.isDarwin then { } else x;
+  linuxOnly = x: if pkgs.stdenv.isLinux then x else { };
 in
 linuxOnly (import ./machines.nix {
   inherit pkgs tfinfo;

doc/README.md

@@ -11,3 +11,6 @@ Or you can build it with Nix at the top level, which will also build the Haddock
 ```
 nix build -f default.nix docs.site
 ```
+
+The doc site from master is built automatically and hosted [here](https://plutus.readthedocs.io/en/latest).
+Additionally, the site is built for all PRs, and a link to a preview can be found in the PR statuses.

doc/_static/theme_overrides.css

@@ -0,0 +1,6 @@
+/* Fix table wrapping https://github.com/readthedocs/sphinx_rtd_theme/issues/117 */
+@media screen and (min-width: 768px) {
+	.wy-table-responsive table td, .wy-table-responsive table th {
+	  white-space: normal !important;
+	}
+}

doc/conf.py

@@ -32,7 +32,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'The Plutus Platform and Marlowe'
-copyright = '2020, IOHK'
+copyright = '2021, IOHK'
 author = 'IOHK'
 
 # The full version, including alpha/beta/rc tags
@@ -135,3 +135,4 @@ def setup(app):
             'enable_auto_toc_tree': False,
             }, True)
     app.add_transform(AutoStructify)
+    app.add_css_file("theme_overrides.css")

doc/default.nix

@@ -1,7 +1,7 @@
 { stdenv, lib, pythonPackages, sphinxcontrib-domaintools, sphinxcontrib-haddock, sphinx-markdown-tables, sphinxemoji, combined-haddock, ... }:
 stdenv.mkDerivation {
   name = "plutus-docs";
-  src = lib.sourceFilesBySuffices ./. [ ".py" ".rst" ".hs" ".png" ".svg" ".bib" ];
+  src = lib.sourceFilesBySuffices ./. [ ".py" ".rst" ".hs" ".png" ".svg" ".bib" ".csv" ".css" ];
   buildInputs = with pythonPackages; [
     sphinx
     sphinx_rtd_theme

doc/plutus-doc.cabal

@@ -38,6 +38,8 @@ common lang
 
 executable doc-doctests
     import: lang
+    if(impl(ghcjs) || os(windows))
+      buildable: False
     hs-source-dirs: plutus/tutorials
     main-is: Main.hs
     ghc-options: -Wno-unused-imports