git: 224e5262c5ee - main - lang/nim: update to 2.2.0

From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Sun, 06 Oct 2024 11:50:14 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=224e5262c5ee03cba1e679a72ac4c09f4a906070

commit 224e5262c5ee03cba1e679a72ac4c09f4a906070
Author:     Neal Nelson <ports@nicandneal.net>
AuthorDate: 2024-10-05 13:39:15 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-10-06 11:49:22 +0000

    lang/nim: update to 2.2.0
    
    Changelog: https://nim-lang.org/blog/2024/10/02/nim-220-2010.html
    
    PR:             281855
---
 lang/nim/Makefile                       |   2 +-
 lang/nim/distinfo                       |   6 +-
 lang/nim/files/patch-koch.nim           | 156 +++++++++++++++++++++++---------
 lang/nim/files/patch-tools_kochdocs.nim |  16 ++--
 lang/nim/pkg-plist                      |  27 ++++--
 5 files changed, 149 insertions(+), 58 deletions(-)

diff --git a/lang/nim/Makefile b/lang/nim/Makefile
index 0828cd466973..b37d4ae39f30 100644
--- a/lang/nim/Makefile
+++ b/lang/nim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nim
-DISTVERSION=	2.0.8
+DISTVERSION=	2.2.0
 CATEGORIES=	lang
 MASTER_SITES=	https://nim-lang.org/download/
 
diff --git a/lang/nim/distinfo b/lang/nim/distinfo
index 12f932e3244d..4ba8ae2cd26d 100644
--- a/lang/nim/distinfo
+++ b/lang/nim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720184077
-SHA256 (nim-2.0.8.tar.xz) = 5702da844700d3129db73170b5c606adbdfb87e82b816c0d91107ea20a65df16
-SIZE (nim-2.0.8.tar.xz) = 7617556
+TIMESTAMP = 1727970846
+SHA256 (nim-2.2.0.tar.xz) = ce9842849c9760e487ecdd1cdadf7c0f2844cafae605401c7c72ae257644893c
+SIZE (nim-2.2.0.tar.xz) = 7896912
diff --git a/lang/nim/files/patch-koch.nim b/lang/nim/files/patch-koch.nim
index ed81b385ee4a..7ad9dcf4be47 100644
--- a/lang/nim/files/patch-koch.nim
+++ b/lang/nim/files/patch-koch.nim
@@ -1,19 +1,19 @@
---- koch.nim.orig	2024-07-05 12:55:45 UTC
+--- koch.nim.orig	2024-10-02 01:48:48 UTC
 +++ koch.nim
 @@ -11,9 +11,9 @@ const
  
  const
    # examples of possible values for repos: Head, ea82b54
--  NimbleStableCommit = "be2f1309b35a6189ff5eb34a007793e6d3f94157" # master
+-  NimbleStableCommit = "4fb6f8e6c33963f6f510fe82d09ad2a61b5e4265" # 0.16.1
 -  AtlasStableCommit = "5faec3e9a33afe99a7d22377dd1b45a5391f5504"
--  ChecksumsStableCommit = "025bcca3915a1b9f19878cea12ad68f9884648fc"
+-  ChecksumsStableCommit = "bd9bf4eaea124bf8d01e08f92ac1b14c6879d8d3"
 +  NimbleStableCommit = "f8bd7b5fa6ea7a583b411b5959b06e6b5eb23667" # master
 +  AtlasStableCommit = "7b780811a168f3f32bff4822369dda46a7f87f9a"
 +  ChecksumsStableCommit = "b4c73320253f78e3a265aec6d9e8feb83f97c77b"
    SatStableCommit = "faf1617f44d7632ee9601ebc13887644925dcc01"
  
    # examples of possible values for fusion: #head, #ea82b54, 1.2.3
-@@ -146,32 +146,32 @@ proc csource(args: string) =
+@@ -150,32 +150,32 @@ proc csource(args: string) =
             "--main:compiler/nim.nim compiler/installer.ini $1") %
         [args, VersionAsString, compileNimInst])
  
@@ -36,7 +36,7 @@
 -                commit = SatStableCommit, allowBundled = true)
 -  # installer.ini expects it under $nim/bin
 -  nimCompile("dist/nimble/src/nimble.nim",
--             options = "-d:release -d:nimNimbleBootstrap --mm:refc --noNimblePath " & args)
+-             options = "-d:release -d:nimNimbleBootstrap --noNimblePath " & args)
 +#proc bundleNimbleExe(latest: bool, args: string) =
 +#  let commit = if latest: "HEAD" else: NimbleStableCommit
 +#  cloneDependency(distDir, "https://github.com/nim-lang/nimble.git",
@@ -47,7 +47,7 @@
 +#                commit = SatStableCommit, allowBundled = true)
 +#  # installer.ini expects it under $nim/bin
 +#  nimCompile("dist/nimble/src/nimble.nim",
-+#             options = "-d:release -d:nimNimbleBootstrap --mm:refc --noNimblePath " & args)
++#             options = "-d:release -d:nimNimbleBootstrap --noNimblePath " & args)
  
 -proc bundleAtlasExe(latest: bool, args: string) =
 -  let commit = if latest: "HEAD" else: AtlasStableCommit
@@ -70,18 +70,28 @@
  
  proc bundleNimsuggest(args: string) =
    nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",
-@@ -208,8 +208,8 @@ proc zip(latest: bool; args: string) =
+@@ -206,14 +206,14 @@ proc bundleWinTools(args: string) =
+     nimCompile(r"tools\downloader.nim",
+                options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args)
+ 
+-proc bundleChecksums(latest: bool) =
+-  let commit = if latest: "HEAD" else: ChecksumsStableCommit
+-  cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", commit, allowBundled = true)
++#proc bundleChecksums(latest: bool) =
++#  let commit = if latest: "HEAD" else: ChecksumsStableCommit
++#  cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", commit, allowBundled = true)
  
  proc zip(latest: bool; args: string) =
-   bundleChecksums(latest)
+-  bundleChecksums(latest)
 -  bundleNimbleExe(latest, args)
 -  bundleAtlasExe(latest, args)
++  #bundleChecksums(latest)
 +  #bundleNimbleExe(latest, args)
 +  #bundleAtlasExe(latest, args)
    bundleNimsuggest(args)
    bundleNimpretty(args)
    bundleWinTools(args)
-@@ -218,15 +218,15 @@ proc zip(latest: bool; args: string) =
+@@ -222,15 +222,15 @@ proc zip(latest: bool; args: string) =
    exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" %
         ["tools/niminst/niminst".exe, VersionAsString])
  
@@ -104,18 +114,81 @@
    nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" %
         [VersionAsString, compileNimInst])
    exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" %
-@@ -262,8 +262,8 @@ proc nsis(latest: bool; args: string) =
+@@ -265,9 +265,9 @@ proc nsis(latest: bool; args: string) =
+   nimCompileFold("Compile testament", "testament/testament.nim", options = "-d:release " & args)
  
  proc nsis(latest: bool; args: string) =
-   bundleChecksums(latest)
+-  bundleChecksums(latest)
 -  bundleNimbleExe(latest, args)
 -  bundleAtlasExe(latest, args)
++  #bundleChecksums(latest)
 +  #bundleNimbleExe(latest, args)
 +  #bundleAtlasExe(latest, args)
    bundleNimsuggest(args)
    bundleWinTools(args)
    # make sure we have generated the niminst executables:
-@@ -526,43 +526,43 @@ proc icTest(args: string) =
+@@ -287,21 +287,21 @@ proc install(args: string) =
+   geninstall()
+   exec("sh ./install.sh $#" % args)
+ 
+-proc installDeps(dep: string, commit = "") =
+-  # the hashes/urls are version controlled here, so can be changed seamlessly
+-  # and tied to a nim release (mimicking git submodules)
+-  var commit = commit
+-  case dep
+-  of "tinyc":
+-    if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3"
+-    cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit)
+-  of "libffi":
+-    # technically a nimble package, however to play nicely with --noNimblePath,
+-    # let's just clone it wholesale:
+-    if commit.len == 0: commit = "bb2bdaf1a29a4bff6fbd8ae4695877cbb3ec783e"
+-    cloneDependency(distDir, "https://github.com/Araq/libffi", commit)
+-  else: doAssert false, "unsupported: " & dep
+-  # xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206
++#proc installDeps(dep: string, commit = "") =
++#  # the hashes/urls are version controlled here, so can be changed seamlessly
++#  # and tied to a nim release (mimicking git submodules)
++#  var commit = commit
++#  case dep
++#  of "tinyc":
++#    if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3"
++#    cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit)
++#  of "libffi":
++#    # technically a nimble package, however to play nicely with --noNimblePath,
++#    # let's just clone it wholesale:
++#    if commit.len == 0: commit = "bb2bdaf1a29a4bff6fbd8ae4695877cbb3ec783e"
++#    cloneDependency(distDir, "https://github.com/Araq/libffi", commit)
++#  else: doAssert false, "unsupported: " & dep
++#  # xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206
+ 
+ # -------------- boot ---------------------------------------------------------
+ 
+@@ -345,11 +345,11 @@ proc boot(args: string, skipIntegrityCheck: bool) =
+   let smartNimcache = (if "release" in args or "danger" in args: "nimcache/r_" else: "nimcache/d_") &
+                       hostOS & "_" & hostCPU
+ 
+-  bundleChecksums(false)
++  #bundleChecksums(false)
+ 
+   let usingLibFFI = "nimHasLibFFI" in args
+-  if usingLibFFI and not dirExists("dist/libffi"):
+-    installDeps("libffi")
++  #if usingLibFFI and not dirExists("dist/libffi"):
++  #  installDeps("libffi")
+ 
+   let nimStart = findStartNim().quoteShell()
+   let times = 2 - ord(skipIntegrityCheck)
+@@ -508,7 +508,7 @@ proc temp(args: string) =
+       result[1].add " " & quoteShell(args[i])
+       inc i
+ 
+-  bundleChecksums(false)
++  #bundleChecksums(false)
+ 
+   let d = getAppDir()
+   let output = d / "compiler" / "nim".exe
+@@ -552,27 +552,27 @@ proc icTest(args: string) =
      exec(cmd)
      inc i
  
@@ -164,33 +237,30 @@
  
  
  proc hostInfo(): string =
-   "hostOS: $1, hostCPU: $2, int: $3, float: $4, cpuEndian: $5, cwd: $6" %
-     [hostOS, hostCPU, $int.sizeof, $float.sizeof, $cpuEndian, getCurrentDir()]
+@@ -620,14 +620,14 @@ proc runCI(cmd: string) =
+     # BUG: with initOptParser, `--batch:'' all` interprets `all` as the argument of --batch, pending bug #14343
+     execFold("Run tester", "nim c -r --putenv:NIM_TESTAMENT_REMOTE_NETWORKING:1 -d:nimStrictMode testament/testament $# all -d:nimCoroutines" % batchParam)
  
--proc installDeps(dep: string, commit = "") =
--  # the hashes/urls are version controlled here, so can be changed seamlessly
--  # and tied to a nim release (mimicking git submodules)
--  var commit = commit
--  case dep
--  of "tinyc":
--    if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3"
--    cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit)
--  else: doAssert false, "unsupported: " & dep
--  # xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206
-+#proc installDeps(dep: string, commit = "") =
-+#  # the hashes/urls are version controlled here, so can be changed seamlessly
-+#  # and tied to a nim release (mimicking git submodules)
-+#  var commit = commit
-+#  case dep
-+#  of "tinyc":
-+#    if commit.len == 0: commit = "916cc2f94818a8a382dd8d4b8420978816c1dfb3"
-+#    cloneDependency(distDir, "https://github.com/timotheecour/nim-tinyc-archive", commit)
-+#  else: doAssert false, "unsupported: " & dep
-+#  # xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206
+-    block: # nimHasLibFFI:
+-      when defined(posix): # windows can be handled in future PR's
+-        installDeps("libffi")
+-        const nimFFI = "bin/nim.ctffi"
+-        # no need to bootstrap with koch boot (would be slower)
+-        let backend = if doUseCpp(): "cpp" else: "c"
+-        execFold("build with -d:nimHasLibFFI", "nim $1 -d:release --noNimblePath -d:nimHasLibFFI --path:./dist -o:$2 compiler/nim.nim" % [backend, nimFFI])
+-        execFold("test with -d:nimHasLibFFI", "$1 $2 -r testament/testament --nim:$1 r tests/misc/trunner.nim -d:nimTrunnerFfi" % [nimFFI, backend])
++    #block: # nimHasLibFFI:
++    #  when defined(posix): # windows can be handled in future PR's
++    #    installDeps("libffi")
++    #    const nimFFI = "bin/nim.ctffi"
++    #    # no need to bootstrap with koch boot (would be slower)
++    #    let backend = if doUseCpp(): "cpp" else: "c"
++    #    execFold("build with -d:nimHasLibFFI", "nim $1 -d:release --noNimblePath -d:nimHasLibFFI --path:./dist -o:$2 compiler/nim.nim" % [backend, nimFFI])
++    #    execFold("test with -d:nimHasLibFFI", "$1 $2 -r testament/testament --nim:$1 r tests/misc/trunner.nim -d:nimTrunnerFfi" % [nimFFI, backend])
  
- proc runCI(cmd: string) =
-   doAssert cmd.len == 0, cmd # avoid silently ignoring
-@@ -684,18 +684,18 @@ proc showHelp(success: bool) =
+     execFold("Run nimdoc tests", "nim r nimdoc/tester")
+     execFold("Run rst2html tests", "nim r nimdoc/rsttester")
+@@ -699,18 +699,18 @@ proc showHelp(success: bool) =
    quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)),
                     CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure)
  
@@ -216,7 +286,7 @@
      localDocsOut = ""
      skipIntegrityCheck = false
    while true:
-@@ -731,34 +731,34 @@ when isMainModule:
+@@ -746,34 +746,34 @@ when isMainModule:
        of "distrohelper": geninstall()
        of "install": install(op.cmdLineRest)
        of "testinstall": testUnixInstall(op.cmdLineRest)
@@ -239,12 +309,14 @@
          buildTools(op.cmdLineRest)
 -        bundleNimbleExe(latest, op.cmdLineRest)
 -        bundleAtlasExe(latest, op.cmdLineRest)
-+        #bundleNimbleExe(latest, op.cmdLineRest)
-+        #bundleAtlasExe(latest, op.cmdLineRest)
-       of "checksums":
-         bundleChecksums(latest)
+-      of "checksums":
+-        bundleChecksums(latest)
 -      of "pushcsource":
 -        quit "use this instead: https://github.com/nim-lang/csources_v1/blob/master/push_c_code.nim"
++        #bundleNimbleExe(latest, op.cmdLineRest)
++        #bundleAtlasExe(latest, op.cmdLineRest)
++      #of "checksums":
++      #  bundleChecksums(latest)
 +      #of "pushcsource":
 +      #  quit "use this instead: https://github.com/nim-lang/csources_v1/blob/master/push_c_code.nim"
        of "valgrind": valgrind(op.cmdLineRest)
diff --git a/lang/nim/files/patch-tools_kochdocs.nim b/lang/nim/files/patch-tools_kochdocs.nim
index 9544149f9839..f52d6cdde677 100644
--- a/lang/nim/files/patch-tools_kochdocs.nim
+++ b/lang/nim/files/patch-tools_kochdocs.nim
@@ -1,6 +1,6 @@
---- tools/kochdocs.nim.orig	2023-08-03 15:46:14 UTC
+--- tools/kochdocs.nim.orig	2024-10-02 01:48:48 UTC
 +++ tools/kochdocs.nim
-@@ -94,7 +94,6 @@ proc nimCompileFold*(desc, input: string, outputDir = 
+@@ -94,7 +94,6 @@ const officialPackagesMarkdown = """
    execFold(desc, cmd)
  
  const officialPackagesMarkdown = """
@@ -8,7 +8,7 @@
  """.splitWhitespace()
  
  proc getMd2html(): seq[string] =
-@@ -157,24 +156,9 @@ lib/std/sha1.nim
+@@ -158,28 +157,9 @@ lib/pure/htmlparser.nim
  """.splitWhitespace()
  
    officialPackagesList = """
@@ -22,6 +22,10 @@
 -pkgs/db_connector/src/db_connector/db_sqlite.nim
 -pkgs/checksums/src/checksums/md5.nim
 -pkgs/checksums/src/checksums/sha1.nim
+-pkgs/checksums/src/checksums/sha2.nim
+-pkgs/checksums/src/checksums/sha3.nim
+-pkgs/checksums/src/checksums/bcrypt.nim
+-pkgs/htmlparser/src/htmlparser.nim
  """.splitWhitespace()
  
    officialPackagesListWithoutIndex = """
@@ -33,12 +37,12 @@
  """.splitWhitespace()
  
  when (NimMajor, NimMinor) < (1, 1) or not declared(isRelativeTo):
-@@ -341,7 +325,7 @@ proc buildJS(): string =
+@@ -348,7 +328,7 @@ proc buildDocsDir*(args: string, dir: string) =
  proc buildDocsDir*(args: string, dir: string) =
    let args = nimArgs & " " & args
    let docHackJsSource = buildJS()
--  gitClonePackages(@["asyncftpclient", "punycode", "smtp", "db_connector", "checksums", "atlas"])
-+  #gitClonePackages(@["asyncftpclient", "punycode", "smtp", "db_connector", "checksums", "atlas"])
+-  gitClonePackages(@["asyncftpclient", "punycode", "smtp", "db_connector", "checksums", "atlas", "htmlparser"])
++  #gitClonePackages(@["asyncftpclient", "punycode", "smtp", "db_connector", "checksums", "atlas", "htmlparser"])
    createDir(dir)
    buildDocSamples(args, dir)
  
diff --git a/lang/nim/pkg-plist b/lang/nim/pkg-plist
index 589e89a41967..9638623a4e9e 100644
--- a/lang/nim/pkg-plist
+++ b/lang/nim/pkg-plist
@@ -53,7 +53,7 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/compiler/ast.html
 %%DOCS%%nim/doc/html/compiler/astalgo.html
 %%DOCS%%nim/doc/html/compiler/astmsgs.html
-%%DOCS%%nim/doc/html/compiler/backendpragmas.html
+%%DOCS%%nim/doc/html/compiler/astyaml.html
 %%DOCS%%nim/doc/html/compiler/bitsets.html
 %%DOCS%%nim/doc/html/compiler/btrees.html
 %%DOCS%%nim/doc/html/compiler/ccgutils.html
@@ -73,6 +73,7 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/compiler/enumtostr.html
 %%DOCS%%nim/doc/html/compiler/errorhandling.html
 %%DOCS%%nim/doc/html/compiler/evaltempl.html
+%%DOCS%%nim/doc/html/compiler/expanddefaults.html
 %%DOCS%%nim/doc/html/compiler/extccomp.html
 %%DOCS%%nim/doc/html/compiler/filter_tmpl.html
 %%DOCS%%nim/doc/html/compiler/filters.html
@@ -82,6 +83,7 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/compiler/ic/cbackend.html
 %%DOCS%%nim/doc/html/compiler/ic/dce.html
 %%DOCS%%nim/doc/html/compiler/ic/ic.html
+%%DOCS%%nim/doc/html/compiler/ic/iclineinfos.html
 %%DOCS%%nim/doc/html/compiler/ic/integrity.html
 %%DOCS%%nim/doc/html/compiler/ic/navigator.html
 %%DOCS%%nim/doc/html/compiler/ic/packed_ast.html
@@ -106,6 +108,7 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/compiler/macrocacheimpl.html
 %%DOCS%%nim/doc/html/compiler/magicsys.html
 %%DOCS%%nim/doc/html/compiler/main.html
+%%DOCS%%nim/doc/html/compiler/mangleutils.html
 %%DOCS%%nim/doc/html/compiler/modulegraphs.html
 %%DOCS%%nim/doc/html/compiler/modulepaths.html
 %%DOCS%%nim/doc/html/compiler/modules.html
@@ -120,6 +123,7 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/compiler/nimpaths.html
 %%DOCS%%nim/doc/html/compiler/nimsets.html
 %%DOCS%%nim/doc/html/compiler/nodejs.html
+%%DOCS%%nim/doc/html/compiler/nodekinds.html
 %%DOCS%%nim/doc/html/compiler/nversion.html
 %%DOCS%%nim/doc/html/compiler/optimizer.html
 %%DOCS%%nim/doc/html/compiler/options.html
@@ -131,13 +135,11 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/compiler/pipelines.html
 %%DOCS%%nim/doc/html/compiler/pipelineutils.html
 %%DOCS%%nim/doc/html/compiler/platform.html
-%%DOCS%%nim/doc/html/compiler/plugins/active.html
-%%DOCS%%nim/doc/html/compiler/plugins/itersgen.html
-%%DOCS%%nim/doc/html/compiler/plugins/locals.html
 %%DOCS%%nim/doc/html/compiler/pluginsupport.html
 %%DOCS%%nim/doc/html/compiler/pragmas.html
 %%DOCS%%nim/doc/html/compiler/prefixmatches.html
 %%DOCS%%nim/doc/html/compiler/procfind.html
+%%DOCS%%nim/doc/html/compiler/pushpoppragmas.html
 %%DOCS%%nim/doc/html/compiler/renderer.html
 %%DOCS%%nim/doc/html/compiler/renderverbatim.html
 %%DOCS%%nim/doc/html/compiler/reorder.html
@@ -157,6 +159,7 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/compiler/sigmatch.html
 %%DOCS%%nim/doc/html/compiler/sourcemap.html
 %%DOCS%%nim/doc/html/compiler/spawn.html
+%%DOCS%%nim/doc/html/compiler/suggestsymdb.html
 %%DOCS%%nim/doc/html/compiler/syntaxes.html
 %%DOCS%%nim/doc/html/compiler/theindex.html
 %%DOCS%%nim/doc/html/compiler/transf.html
@@ -173,6 +176,7 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/compiler/vmgen.html
 %%DOCS%%nim/doc/html/compiler/vmmarshal.html
 %%DOCS%%nim/doc/html/compiler/vmprofiler.html
+%%DOCS%%nim/doc/html/compiler/vtables.html
 %%DOCS%%nim/doc/html/compiler/wordrecg.html
 %%DOCS%%nim/doc/html/compilesettings.html
 %%DOCS%%nim/doc/html/complex.html
@@ -225,7 +229,6 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/highlite.html
 %%DOCS%%nim/doc/html/hotcodereloading.html
 %%DOCS%%nim/doc/html/htmlgen.html
-%%DOCS%%nim/doc/html/htmlparser.html
 %%DOCS%%nim/doc/html/httpclient.html
 %%DOCS%%nim/doc/html/httpcore.html
 %%DOCS%%nim/doc/html/idetools.html
@@ -346,6 +349,7 @@ nim/config/nimdoc.tex.cfg
 %%DOCS%%nim/doc/html/ssl_certs.html
 %%DOCS%%nim/doc/html/ssl_config.html
 %%DOCS%%nim/doc/html/stackframes.html
+%%DOCS%%nim/doc/html/staticos.html
 %%DOCS%%nim/doc/html/stats.html
 %%DOCS%%nim/doc/html/strbasics.html
 %%DOCS%%nim/doc/html/streams.html
@@ -444,9 +448,10 @@ nim/lib/compiler/aliases.nim
 nim/lib/compiler/ast.nim
 nim/lib/compiler/astalgo.nim
 nim/lib/compiler/astmsgs.nim
-nim/lib/compiler/backendpragmas.nim
+nim/lib/compiler/astyaml.nim
 nim/lib/compiler/bitsets.nim
 nim/lib/compiler/btrees.nim
+nim/lib/compiler/cbuilder.nim
 nim/lib/compiler/ccgcalls.nim
 nim/lib/compiler/ccgexprs.nim
 nim/lib/compiler/ccgliterals.nim
@@ -476,6 +481,7 @@ nim/lib/compiler/enumtostr.nim
 nim/lib/compiler/errorhandling.nim
 nim/lib/compiler/evalffi.nim
 nim/lib/compiler/evaltempl.nim
+nim/lib/compiler/expanddefaults.nim
 nim/lib/compiler/extccomp.nim
 nim/lib/compiler/filter_tmpl.nim
 nim/lib/compiler/filters.nim
@@ -487,6 +493,7 @@ nim/lib/compiler/ic/cbackend.nim
 nim/lib/compiler/ic/dce.nim
 nim/lib/compiler/ic/design.rst
 nim/lib/compiler/ic/ic.nim
+nim/lib/compiler/ic/iclineinfos.nim
 nim/lib/compiler/ic/integrity.nim
 nim/lib/compiler/ic/navigator.nim
 nim/lib/compiler/ic/packed_ast.nim
@@ -514,6 +521,7 @@ nim/lib/compiler/lowerings.nim
 nim/lib/compiler/macrocacheimpl.nim
 nim/lib/compiler/magicsys.nim
 nim/lib/compiler/main.nim
+nim/lib/compiler/mangleutils.nim
 nim/lib/compiler/mapping.txt
 nim/lib/compiler/modulegraphs.nim
 nim/lib/compiler/modulepaths.nim
@@ -530,6 +538,7 @@ nim/lib/compiler/nimlexbase.nim
 nim/lib/compiler/nimpaths.nim
 nim/lib/compiler/nimsets.nim
 nim/lib/compiler/nodejs.nim
+nim/lib/compiler/nodekinds.nim
 nim/lib/compiler/nversion.nim
 nim/lib/compiler/optimizer.nim
 nim/lib/compiler/options.nim
@@ -545,12 +554,15 @@ nim/lib/compiler/pipelines.nim
 nim/lib/compiler/pipelineutils.nim
 nim/lib/compiler/platform.nim
 nim/lib/compiler/plugins/active.nim
+nim/lib/compiler/plugins/customast.nim
 nim/lib/compiler/plugins/itersgen.nim
 nim/lib/compiler/plugins/locals.nim
+nim/lib/compiler/plugins/plugins.nimble
 nim/lib/compiler/pluginsupport.nim
 nim/lib/compiler/pragmas.nim
 nim/lib/compiler/prefixmatches.nim
 nim/lib/compiler/procfind.nim
+nim/lib/compiler/pushpoppragmas.nim
 nim/lib/compiler/readme.md
 nim/lib/compiler/renderer.nim
 nim/lib/compiler/renderverbatim.nim
@@ -584,6 +596,7 @@ nim/lib/compiler/sizealignoffsetimpl.nim
 nim/lib/compiler/sourcemap.nim
 nim/lib/compiler/spawn.nim
 nim/lib/compiler/suggest.nim
+nim/lib/compiler/suggestsymdb.nim
 nim/lib/compiler/syntaxes.nim
 nim/lib/compiler/tccgen.nim
 nim/lib/compiler/transf.nim
@@ -602,6 +615,7 @@ nim/lib/compiler/vmhooks.nim
 nim/lib/compiler/vmmarshal.nim
 nim/lib/compiler/vmops.nim
 nim/lib/compiler/vmprofiler.nim
+nim/lib/compiler/vtables.nim
 nim/lib/compiler/wordrecg.nim
 nim/lib/core/hotcodereloading.nim
 nim/lib/core/locks.nim
@@ -849,6 +863,7 @@ nim/lib/std/setutils.nim
 nim/lib/std/sha1.nim
 nim/lib/std/socketstreams.nim
 nim/lib/std/stackframes.nim
+nim/lib/std/staticos.nim
 nim/lib/std/strbasics.nim
 nim/lib/std/symlinks.nim
 nim/lib/std/syncio.nim