update: New & Old base library doc generation

doc/Makefile

@@ -18,6 +18,7 @@ overview-slides.html : overview-slides.md
 	  # # -V maxScale=2
 
 base:
+	mo-doc --source $(MOTOKO_CORE) --output $(OUT)/core --format plain
 	mo-doc --source $(MOTOKO_BASE) --output $(OUT)/base --format plain
 
 html:

flake.nix

@@ -41,6 +41,10 @@
       url = "github:dfinity/motoko-base/next-moc";
       flake = false;
     };
+    motoko-core-src = {
+      url = "github:dfinity/new-motoko-base";
+      flake = false;
+    };
     motoko-matchers-src = {
       url = "github:kritzcreek/motoko-matchers";
       flake = false;
@@ -72,6 +76,7 @@
     , ic-wasm-src
     , libtommath-src
     , motoko-base-src
+    , motoko-core-src
     , motoko-matchers-src
     , ocaml-vlq-src
     , wasm-spec-src
@@ -87,6 +92,7 @@
             ic-wasm-src
             libtommath-src
             motoko-base-src
+            motoko-core-src
             motoko-matchers-src
             ocaml-vlq-src
             wasm-spec-src
@@ -168,9 +174,14 @@
         paths = [ "${pkgs.sources.motoko-base-src}/src" ];
       };
 
+      core-src = pkgs.symlinkJoin {
+        name = "core-src";
+        paths = [ "${pkgs.sources.motoko-core-src}/src" ];
+      };
+
       js = import ./nix/moc.js.nix { inherit pkgs commonBuildInputs rts; };
 
-      docs = import ./nix/docs.nix { inherit pkgs js base-src; };
+      docs = import ./nix/docs.nix { inherit pkgs js base-src core-src; };
 
       checks = {
         check-formatting = import ./nix/check-formatting.nix { inherit pkgs; };
@@ -182,7 +193,7 @@
       nix-update = nix-update-flake.packages.${system}.default;
 
       shell = import ./nix/shell.nix {
-        inherit pkgs nix-update base-src llvmEnv esm viper-server commonBuildInputs rts js debugMoPackages docs;
+        inherit pkgs nix-update base-src core-src llvmEnv esm viper-server commonBuildInputs rts js debugMoPackages docs;
         inherit (checks) check-rts-formatting;
       };
 
@@ -192,7 +203,7 @@
         base-doc = import ./nix/base-doc.nix { inherit pkgs; inherit (debugMoPackages) mo-doc; };
         report-site = import ./nix/report-site.nix { inherit pkgs base-doc docs; inherit (tests) coverage; };
 
-        inherit rts base-src docs shell;
+        inherit rts base-src core-src docs shell;
       };
     in
     {

nix/core-doc.nix

@@ -0,0 +1,18 @@
+{ pkgs, mo-doc }:
+pkgs.stdenv.mkDerivation {
+  name = "core-doc";
+  src = pkgs.sources.motoko-core-src;
+  phases = "unpackPhase buildPhase installPhase";
+  doCheck = true;
+  buildInputs = [ mo-doc ];
+  buildPhase = ''
+    mo-doc
+  '';
+  installPhase = ''
+    mkdir -p $out
+    cp -rv docs/* $out/
+
+    mkdir -p $out/nix-support
+    echo "report docs $out index.html" >> $out/nix-support/hydra-build-products
+  '';
+}

nix/docs.nix

@@ -1,4 +1,4 @@
-{ pkgs, js, base-src }:
+{ pkgs, js, base-src, core-src }:
 pkgs.stdenv.mkDerivation {
   name = "docs";
   src = ../doc;
@@ -9,6 +9,7 @@ pkgs.stdenv.mkDerivation {
     export HOME=$PWD
     export MOC_JS=${js.moc}/bin/moc.js
     export MOTOKO_BASE=${base-src}
+    export MOTOKO_CORE=${core-src}
     make
   '';
 

nix/shell.nix

@@ -1,6 +1,7 @@
 { pkgs
 , nix-update
 , base-src
+, core-src
 , llvmEnv
 , esm
 , viper-server
@@ -80,6 +81,7 @@ pkgs.mkShell {
   TOMMATHSRC = pkgs.sources.libtommath-src;
   LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";
   MOTOKO_BASE = base-src;
+  MOTOKO_CORE = core-src;
   CANDID_TESTS = "${pkgs.sources.candid-src}/test";
   VIPER_SERVER = "${viper-server}";