Date: Thu, 31 Aug 2023 09:43:52 GMT From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3a22c2fedb4f - main - lang/nim: Upgrade to 2.0.0 Message-ID: <202308310943.37V9hqZK066799@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a22c2fedb4f28b6ddab01c97d784b83e42e3763 commit 3a22c2fedb4f28b6ddab01c97d784b83e42e3763 Author: Neal Nelson <ports@nicandneal.net> AuthorDate: 2023-08-30 08:25:44 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2023-08-31 09:43:40 +0000 lang/nim: Upgrade to 2.0.0 ChangeLog: https://nim-lang.org/blog/2023/08/01/nim-v20-released.html PR: 273423 Reported by: ports@nicandneal.net (maintainer) --- lang/nim/Makefile | 46 +- lang/nim/distinfo | 6 +- lang/nim/files/patch-build.sh | 15 - lang/nim/files/patch-compiler_nimpaths.nim | 13 - lang/nim/files/patch-config-nim.cfg | 16 +- lang/nim/files/patch-koch.nim | 93 +- lang/nim/files/patch-tools_deps.nim | 49 + lang/nim/files/patch-tools_kochdocs.nim | 44 + lang/nim/pkg-message | 2 + lang/nim/pkg-plist | 1863 ++++++++++++++-------------- 10 files changed, 1128 insertions(+), 1019 deletions(-) diff --git a/lang/nim/Makefile b/lang/nim/Makefile index 0782766fdbc4..246b94f9d324 100644 --- a/lang/nim/Makefile +++ b/lang/nim/Makefile @@ -1,5 +1,5 @@ PORTNAME= nim -DISTVERSION= 1.6.14 +DISTVERSION= 2.0.0 CATEGORIES= lang MASTER_SITES= https://nim-lang.org/download/ @@ -38,19 +38,14 @@ EXTRA_PATCHES= ${PATCHDIR}/elfv1-patch-build.sh EXTRA_PATCHES= ${PATCHDIR}/clang-patch-build.sh .endif +NIMDIR= ${STAGEDIR}${PREFIX}/nim + post-patch: .if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 @${REINPLACE_CMD} -e '/cc =/s/clang/gcc/' ${WRKSRC}/config/nim.cfg @${REINPLACE_CMD} -e s/%%GCC_DEFAULT%%/${GCC_DEFAULT}/ \ ${WRKSRC}/build.sh ${WRKSRC}/config/nim.cfg .endif - # Make a fake nimdoc.css so that we can change the expected target - # to where it should be, instead of where the nim project hard - # code it to be. - ${MKDIR} ${WRKSRC}/share/doc/nim - ${LN} -s ${WRKSRC}/doc/nimdoc.css ${WRKSRC}/share/doc/nim/nimdoc.css - ${MKDIR} ${WRKSRC}/share/nim - ${LN} -s ${WRKSRC}/tools/dochack ${WRKSRC}/share/nim/dochack do-build: cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \ @@ -73,35 +68,36 @@ do-build-TOOLS-on: -d:release --nimcache=${WRKSRC}/nimcache do-install: + ${MKDIR} ${NIMDIR} + ${MKDIR} ${NIMDIR}/bin # Install nim compiler - ${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${STAGEDIR}${PREFIX}/bin - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nim + ${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${NIMDIR}/bin + ${STRIP_CMD} ${NIMDIR}/bin/nim # Install lib nim rtl - ${INSTALL_LIB} ${WRKSRC}/lib/libnimrtl.so ${STAGEDIR}${PREFIX}/lib + ${MKDIR} ${NIMDIR}/lib + ${INSTALL_LIB} ${WRKSRC}/lib/libnimrtl.so ${NIMDIR}/lib # Install nim lib files - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME} "! -name libnimrtl.so") - ${REINPLACE_CMD} 's|\.\.\/doc|/usr/local/share/doc/nim|g' ${WRKSRC}/compiler/commands.nim - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/compiler - (cd ${WRKSRC}/compiler && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/compiler "! -name nim ! -name nim1") + (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${NIMDIR}/lib "! -name libnimrtl.so") + ${MKDIR} ${NIMDIR}/lib/compiler + (cd ${WRKSRC}/compiler && ${COPYTREE_SHARE} . ${NIMDIR}/lib/compiler "! -name nim ! -name nim1") # Configuration files - ${MKDIR} ${STAGEDIR}${ETCDIR} + ${MKDIR} ${NIMDIR}/config .for file in nim.cfg nimdoc.cfg nimdoc.tex.cfg - ${INSTALL_DATA} ${WRKSRC}/config/${file} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/config/${file} ${NIMDIR}/config .endfor do-install-DOCS-on: ${FIND} ${WRKSRC}/doc -name "*.idx" -delete - ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - ${MKDIR} ${STAGEDIR}${PREFIX}/share/nim/dochack - ${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.nim ${STAGEDIR}${PREFIX}/share/nim/dochack - ${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.js ${STAGEDIR}${PREFIX}/share/nim/dochack - ${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/fuzzysearch.nim ${STAGEDIR}${PREFIX}/share/nim/dochack + ${MKDIR} ${NIMDIR}/doc + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${NIMDIR}/doc) + ${MKDIR} ${NIMDIR}/tools/dochack + ${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.nim ${NIMDIR}/tools/dochack + ${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.js ${NIMDIR}/tools/dochack + ${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/fuzzysearch.nim ${NIMDIR}/tools/dochack do-install-TOOLS-on: .for t in ${TLIST} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${t} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${t} ${NIMDIR}/bin .endfor do-test: diff --git a/lang/nim/distinfo b/lang/nim/distinfo index fac5913bc927..6c1b7751a229 100644 --- a/lang/nim/distinfo +++ b/lang/nim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687959495 -SHA256 (nim-1.6.14.tar.xz) = d070d2f28ae2400df7fe4a49eceb9f45cd539906b107481856a0af7a8fa82dc9 -SIZE (nim-1.6.14.tar.xz) = 5266632 +TIMESTAMP = 1690986777 +SHA256 (nim-2.0.0.tar.xz) = bd6101d840036fb78e93a69df6cf3f9fd0c21cd754b695ff84a3b4add8ed0af7 +SIZE (nim-2.0.0.tar.xz) = 7491724 diff --git a/lang/nim/files/patch-build.sh b/lang/nim/files/patch-build.sh deleted file mode 100644 index aa7b1edb9930..000000000000 --- a/lang/nim/files/patch-build.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- build.sh.orig 2021-11-07 03:12:45 UTC -+++ build.sh -@@ -191,8 +191,10 @@ case $ucpu in - mycpu="powerpc64" ;; - *power*|*ppc* ) - if [ "$myos" = "freebsd" ] ; then -- COMP_FLAGS="$COMP_FLAGS -m64" -- LINK_FLAGS="$LINK_FLAGS -m64" -+ if [ "$ucpu" != "powerpc" ] ; then -+ COMP_FLAGS="$COMP_FLAGS -m64" -+ LINK_FLAGS="$LINK_FLAGS -m64" -+ fi - mycpu=`uname -p` - case $mycpu in - powerpc64le) diff --git a/lang/nim/files/patch-compiler_nimpaths.nim b/lang/nim/files/patch-compiler_nimpaths.nim deleted file mode 100644 index 40ee13ff8f4e..000000000000 --- a/lang/nim/files/patch-compiler_nimpaths.nim +++ /dev/null @@ -1,13 +0,0 @@ ---- compiler/nimpaths.nim.orig 2022-11-21 01:04:21 UTC -+++ compiler/nimpaths.nim -@@ -20,8 +20,8 @@ Unstable API - import os, strutils - - const -- docCss* = "$nimr/doc/nimdoc.css" -- docHackNim* = "$nimr/tools/dochack/dochack.nim" -+ docCss* = "$nimr/share/doc/nim/nimdoc.css" -+ docHackNim* = "$nimr/share/nim/dochack/dochack.nim" - docHackJs* = docHackNim.changeFileExt("js") - docHackJsFname* = docHackJs.lastPathPart - theindexFname* = "theindex.html" diff --git a/lang/nim/files/patch-config-nim.cfg b/lang/nim/files/patch-config-nim.cfg index ba75436b6b0c..0df182ac5da9 100644 --- a/lang/nim/files/patch-config-nim.cfg +++ b/lang/nim/files/patch-config-nim.cfg @@ -1,6 +1,6 @@ ---- config/nim.cfg.orig 2021-10-20 15:37:06 UTC +--- config/nim.cfg.orig 2023-08-02 14:51:21 UTC +++ config/nim.cfg -@@ -107,10 +107,7 @@ nimblepath="$home/.nimble/pkgs/" +@@ -130,10 +130,7 @@ nimblepath="$home/.nimble/pkgs/" @end @if unix: @@ -12,15 +12,3 @@ gcc.options.linker = "-Wl,--as-needed -lnetwork" gcc.cpp.options.linker = "-Wl,--as-needed -lnetwork" clang.options.linker = "-Wl,--as-needed -lnetwork" -@@ -160,11 +157,6 @@ nimblepath="$home/.nimble/pkgs/" - @end - - gcc.maxerrorsimpl = "-fmax-errors=3" -- --@if bsd: -- # at least NetBSD has problems with thread local storage: -- tlsEmulation:on --@end - - @if macosx or freebsd or openbsd: - cc = clang diff --git a/lang/nim/files/patch-koch.nim b/lang/nim/files/patch-koch.nim index 7c03a13acc90..87fb31e33dfb 100644 --- a/lang/nim/files/patch-koch.nim +++ b/lang/nim/files/patch-koch.nim @@ -1,6 +1,6 @@ ---- koch.nim.orig 2021-10-19 00:39:28 UTC +--- koch.nim.orig 2023-08-01 01:01:01 UTC +++ koch.nim -@@ -139,18 +139,18 @@ proc csource(args: string) = +@@ -145,28 +145,28 @@ proc csource(args: string) = "--main:compiler/nim.nim compiler/installer.ini $1") % [args, VersionAsString, compileNimInst]) @@ -17,29 +17,50 @@ - let commit = if latest: "HEAD" else: NimbleStableCommit - cloneDependency(distDir, "https://github.com/nim-lang/nimble.git", - commit = commit, allowBundled = true) +- cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/checksums.git", +- commit = ChecksumsStableCommit, allowBundled = true) # or copy it from dist? - # installer.ini expects it under $nim/bin - nimCompile("dist/nimble/src/nimble.nim", -- options = "-d:release --noNimblePath " & args) +- options = "-d:release --mm:refc --noNimblePath " & args) +#proc bundleNimbleExe(latest: bool, args: string) = +# let commit = if latest: "HEAD" else: NimbleStableCommit +# cloneDependency(distDir, "https://github.com/nim-lang/nimble.git", +# commit = commit, allowBundled = true) ++# cloneDependency(distDir / "nimble" / distDir, "https://github.com/nim-lang/checksums.git", ++# commit = ChecksumsStableCommit, allowBundled = true) # or copy it from dist? +# # installer.ini expects it under $nim/bin +# nimCompile("dist/nimble/src/nimble.nim", ++# options = "-d:release --mm:refc --noNimblePath " & args) + +-proc bundleAtlasExe(latest: bool, args: string) = +- let commit = if latest: "HEAD" else: AtlasStableCommit +- cloneDependency(distDir, "https://github.com/nim-lang/atlas.git", +- commit = commit, allowBundled = true) +- # installer.ini expects it under $nim/bin +- nimCompile("dist/atlas/src/atlas.nim", +- options = "-d:release --noNimblePath " & args) ++#proc bundleAtlasExe(latest: bool, args: string) = ++# let commit = if latest: "HEAD" else: AtlasStableCommit ++# cloneDependency(distDir, "https://github.com/nim-lang/atlas.git", ++# commit = commit, allowBundled = true) ++# # installer.ini expects it under $nim/bin ++# nimCompile("dist/atlas/src/atlas.nim", +# options = "-d:release --noNimblePath " & args) proc bundleNimsuggest(args: string) = nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim", -@@ -182,7 +182,7 @@ proc bundleWinTools(args: string) = - options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args) +@@ -203,8 +203,8 @@ proc bundleChecksums(latest: bool) = proc zip(latest: bool; args: string) = + bundleChecksums(latest) - bundleNimbleExe(latest, args) +- bundleAtlasExe(latest, args) + #bundleNimbleExe(latest, args) ++ #bundleAtlasExe(latest, args) bundleNimsuggest(args) bundleNimpretty(args) bundleWinTools(args) -@@ -191,15 +191,15 @@ proc zip(latest: bool; args: string) = +@@ -213,15 +213,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]) @@ -62,16 +83,18 @@ 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" % -@@ -231,7 +231,7 @@ proc buildTools(args: string = "") = - +@@ -257,8 +257,8 @@ proc testTools(args: string = "") = proc nsis(latest: bool; args: string) = + bundleChecksums(latest) - bundleNimbleExe(latest, args) +- bundleAtlasExe(latest, args) + #bundleNimbleExe(latest, args) ++ #bundleAtlasExe(latest, args) bundleNimsuggest(args) bundleWinTools(args) # make sure we have generated the niminst executables: -@@ -503,27 +503,27 @@ proc icTest(args: string) = +@@ -521,42 +521,42 @@ proc icTest(args: string) = exec(cmd) inc i @@ -120,29 +143,29 @@ proc hostInfo(): string = -@@ -535,9 +535,9 @@ proc installDeps(dep: string, commit = "") = + "hostOS: $1, hostCPU: $2, int: $3, float: $4, cpuEndian: $5, cwd: $6" % + [hostOS, hostCPU, $int.sizeof, $float.sizeof, $cpuEndian, getCurrentDir()] + +-proc installDeps(dep: string, commit = "") = ++#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 +- 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 ++# 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 ++# else: doAssert false, "unsupported: " & dep # xxx: also add linenoise, niminst etc, refs https://github.com/nim-lang/RFCs/issues/206 -@@ -599,7 +599,7 @@ proc runCI(cmd: string) = - execFold("build nimsuggest_testing", "nim c -o:bin/nimsuggest_testing -d:release nimsuggest/nimsuggest") - execFold("Run nimsuggest tests", "nim r nimsuggest/tester") - -- execFold("Run atlas tests", "nim c -r -d:atlasTests tools/atlas/atlas.nim clone https://github.com/disruptek/balls") -+ #execFold("Run atlas tests", "nim c -r -d:atlasTests tools/atlas/atlas.nim clone https://github.com/disruptek/balls") - - when not defined(bsd): - if not doUseCpp: -@@ -662,12 +662,12 @@ proc showHelp(success: bool) = + proc runCI(cmd: string) = +@@ -679,18 +679,18 @@ proc showHelp(success: bool) = quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)), CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure) @@ -161,12 +184,28 @@ when isMainModule: var op = initOptParser() -@@ -712,24 +712,24 @@ when isMainModule: + var + latest = false +- localDocsOnly = false ++ localDocsOnly = true + localDocsOut = "" + skipIntegrityCheck = false + while true: +@@ -726,34 +726,34 @@ when isMainModule: + of "distrohelper": geninstall() + of "install": install(op.cmdLineRest) + of "testinstall": testUnixInstall(op.cmdLineRest) +- of "installdeps": installDeps(op.cmdLineRest) ++ #of "installdeps": installDeps(op.cmdLineRest) + of "runci": runCI(op.cmdLineRest) + of "test", "tests": tests(op.cmdLineRest) of "temp": temp(op.cmdLineRest) of "xtemp": xtemp(op.cmdLineRest) of "wintools": bundleWinTools(op.cmdLineRest) - of "nimble": bundleNimbleExe(latest, op.cmdLineRest) +- of "atlas": bundleAtlasExe(latest, op.cmdLineRest) + #of "nimble": bundleNimbleExe(latest, op.cmdLineRest) ++ #of "atlas": bundleAtlasExe(latest, op.cmdLineRest) of "nimsuggest": bundleNimsuggest(op.cmdLineRest) # toolsNoNimble is kept for backward compatibility with build scripts of "toolsnonimble", "toolsnoexternal": @@ -174,9 +213,13 @@ of "tools": buildTools(op.cmdLineRest) - bundleNimbleExe(latest, op.cmdLineRest) +- bundleAtlasExe(latest, op.cmdLineRest) ++ #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" -+ #bundleNimbleExe(latest, op.cmdLineRest) + #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_deps.nim b/lang/nim/files/patch-tools_deps.nim new file mode 100644 index 000000000000..7ced3335f283 --- /dev/null +++ b/lang/nim/files/patch-tools_deps.nim @@ -0,0 +1,49 @@ +--- tools/deps.nim.orig 2023-08-02 16:00:39 UTC ++++ tools/deps.nim +@@ -20,25 +20,26 @@ proc execRetry(cmd: string) = + + proc cloneDependency*(destDirBase: string, url: string, commit = commitHead, + appendRepoName = true, allowBundled = false) = +- let destDirBase = destDirBase.absolutePath +- let p = url.parseUri.path +- let name = p.splitFile.name +- var destDir = destDirBase +- if appendRepoName: destDir = destDir / name +- let quotedDestDir = destDir.quoteShell +- if not dirExists(destDir): ++ #let destDirBase = destDirBase.absolutePath ++ #let p = url.parseUri.path ++ #let name = p.splitFile.name ++ #var destDir = destDirBase ++ #if appendRepoName: destDir = destDir / name ++ #let quotedDestDir = destDir.quoteShell ++ #if not dirExists(destDir): + # note: old code used `destDir / .git` but that wouldn't prevent git clone + # from failing +- execRetry fmt"git clone -q {url} {quotedDestDir}" +- if isGitRepo(destDir): +- let oldDir = getCurrentDir() +- setCurrentDir(destDir) +- try: +- execRetry "git fetch -q" +- exec fmt"git checkout -q {commit}" +- finally: +- setCurrentDir(oldDir) +- elif allowBundled: +- discard "this dependency was bundled with Nim, don't do anything" +- else: +- quit "FAILURE: " & destdir & " already exists but is not a git repo" ++ # execRetry fmt"git clone -q {url} {quotedDestDir}" ++ #if isGitRepo(destDir): ++ # let oldDir = getCurrentDir() ++ # setCurrentDir(destDir) ++ # try: ++ # execRetry "git fetch -q" ++ # exec fmt"git checkout -q {commit}" ++ # finally: ++ # setCurrentDir(oldDir) ++ #elif allowBundled: ++ # discard "this dependency was bundled with Nim, don't do anything" ++ #else: ++ # quit "FAILURE: " & destdir & " already exists but is not a git repo" ++ quit "FAILURE: git operations now allowed!: " & destDirBase diff --git a/lang/nim/files/patch-tools_kochdocs.nim b/lang/nim/files/patch-tools_kochdocs.nim new file mode 100644 index 000000000000..9544149f9839 --- /dev/null +++ b/lang/nim/files/patch-tools_kochdocs.nim @@ -0,0 +1,44 @@ +--- tools/kochdocs.nim.orig 2023-08-03 15:46:14 UTC ++++ tools/kochdocs.nim +@@ -94,7 +94,6 @@ proc nimCompileFold*(desc, input: string, outputDir = + execFold(desc, cmd) + + const officialPackagesMarkdown = """ +-pkgs/atlas/doc/atlas.md + """.splitWhitespace() + + proc getMd2html(): seq[string] = +@@ -157,24 +156,9 @@ lib/std/sha1.nim + """.splitWhitespace() + + officialPackagesList = """ +-pkgs/asyncftpclient/src/asyncftpclient.nim +-pkgs/smtp/src/smtp.nim +-pkgs/punycode/src/punycode.nim +-pkgs/db_connector/src/db_connector/db_common.nim +-pkgs/db_connector/src/db_connector/db_mysql.nim +-pkgs/db_connector/src/db_connector/db_odbc.nim +-pkgs/db_connector/src/db_connector/db_postgres.nim +-pkgs/db_connector/src/db_connector/db_sqlite.nim +-pkgs/checksums/src/checksums/md5.nim +-pkgs/checksums/src/checksums/sha1.nim + """.splitWhitespace() + + officialPackagesListWithoutIndex = """ +-pkgs/db_connector/src/db_connector/mysql.nim +-pkgs/db_connector/src/db_connector/sqlite3.nim +-pkgs/db_connector/src/db_connector/postgres.nim +-pkgs/db_connector/src/db_connector/odbcsql.nim +-pkgs/db_connector/src/db_connector/private/dbutils.nim + """.splitWhitespace() + + when (NimMajor, NimMinor) < (1, 1) or not declared(isRelativeTo): +@@ -341,7 +325,7 @@ proc buildJS(): 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"]) + createDir(dir) + buildDocSamples(args, dir) + diff --git a/lang/nim/pkg-message b/lang/nim/pkg-message new file mode 100644 index 000000000000..1bb050830ae7 --- /dev/null +++ b/lang/nim/pkg-message @@ -0,0 +1,2 @@ +Nim is now installed in /usr/local/nim, so you should add /usr/local/nim/bin +to your shell path. diff --git a/lang/nim/pkg-plist b/lang/nim/pkg-plist index 7827d700a7ea..a58f613bc6d2 100644 --- a/lang/nim/pkg-plist +++ b/lang/nim/pkg-plist @@ -1,924 +1,939 @@ -bin/nim -%%TOOLS%%bin/nimgrep -%%TOOLS%%bin/nimpretty -%%TOOLS%%bin/nimsuggest -%%TOOLS%%bin/testament -%%ETCDIR%%/nim.cfg -%%ETCDIR%%/nimdoc.cfg -%%ETCDIR%%/nimdoc.tex.cfg -lib/libnimrtl.so -lib/nim/arch/x86/amd64.S -lib/nim/arch/x86/i386.S -lib/nim/compilation.nim -lib/nim/compiler/aliases.nim -lib/nim/compiler/ast.nim -lib/nim/compiler/astalgo.nim -lib/nim/compiler/astmsgs.nim -lib/nim/compiler/bitsets.nim -lib/nim/compiler/btrees.nim -lib/nim/compiler/ccgcalls.nim -lib/nim/compiler/ccgexprs.nim -lib/nim/compiler/ccgliterals.nim -lib/nim/compiler/ccgmerge_unused.nim -lib/nim/compiler/ccgreset.nim -lib/nim/compiler/ccgstmts.nim -lib/nim/compiler/ccgthreadvars.nim -lib/nim/compiler/ccgtrav.nim -lib/nim/compiler/ccgtypes.nim -lib/nim/compiler/ccgutils.nim -lib/nim/compiler/cgen.nim -lib/nim/compiler/cgendata.nim -lib/nim/compiler/cgmeth.nim -lib/nim/compiler/closureiters.nim -lib/nim/compiler/cmdlinehelper.nim -lib/nim/compiler/commands.nim -lib/nim/compiler/concepts.nim -lib/nim/compiler/condsyms.nim -lib/nim/compiler/debuginfo.nim -lib/nim/compiler/debugutils.nim -lib/nim/compiler/depends.nim -lib/nim/compiler/dfa.nim -lib/nim/compiler/docgen.nim -lib/nim/compiler/docgen2.nim -lib/nim/compiler/enumtostr.nim -lib/nim/compiler/errorhandling.nim -lib/nim/compiler/evalffi.nim -lib/nim/compiler/evaltempl.nim -lib/nim/compiler/extccomp.nim -lib/nim/compiler/filter_tmpl.nim -lib/nim/compiler/filters.nim -lib/nim/compiler/gorgeimpl.nim -lib/nim/compiler/guards.nim -lib/nim/compiler/hlo.nim -lib/nim/compiler/ic/bitabs.nim -lib/nim/compiler/ic/cbackend.nim -lib/nim/compiler/ic/dce.nim -lib/nim/compiler/ic/design.rst -lib/nim/compiler/ic/ic.nim -lib/nim/compiler/ic/integrity.nim -lib/nim/compiler/ic/navigator.nim -lib/nim/compiler/ic/packed_ast.nim -lib/nim/compiler/ic/replayer.nim -lib/nim/compiler/ic/rodfiles.nim -lib/nim/compiler/idents.nim -lib/nim/compiler/importer.nim -lib/nim/compiler/index.nim -lib/nim/compiler/injectdestructors.nim -lib/nim/compiler/installer.ini -lib/nim/compiler/int128.nim -lib/nim/compiler/isolation_check.nim -lib/nim/compiler/jsgen.nim -lib/nim/compiler/jstypes.nim -lib/nim/compiler/lambdalifting.nim -lib/nim/compiler/layouter.nim -lib/nim/compiler/lexer.nim -lib/nim/compiler/liftdestructors.nim -lib/nim/compiler/liftlocals.nim -lib/nim/compiler/lineinfos.nim -lib/nim/compiler/linter.nim -lib/nim/compiler/llstream.nim -lib/nim/compiler/lookups.nim -lib/nim/compiler/lowerings.nim -lib/nim/compiler/macrocacheimpl.nim -lib/nim/compiler/magicsys.nim -lib/nim/compiler/main.nim -lib/nim/compiler/mapping.txt -lib/nim/compiler/modulegraphs.nim -lib/nim/compiler/modulepaths.nim -lib/nim/compiler/modules.nim -lib/nim/compiler/msgs.nim -lib/nim/compiler/ndi.nim -lib/nim/compiler/nilcheck.nim -lib/nim/compiler/nim.cfg -lib/nim/compiler/nim.nim -lib/nim/compiler/nimblecmd.nim -lib/nim/compiler/nimconf.nim -lib/nim/compiler/nimeval.nim -lib/nim/compiler/nimfix/nimfix.nim -lib/nim/compiler/nimfix/nimfix.nim.cfg -lib/nim/compiler/nimfix/prettybase.nim -lib/nim/compiler/nimlexbase.nim -lib/nim/compiler/nimpaths.nim -lib/nim/compiler/nimsets.nim -lib/nim/compiler/nodejs.nim -lib/nim/compiler/nversion.nim -lib/nim/compiler/optimizer.nim -lib/nim/compiler/options.nim -lib/nim/compiler/packagehandling.nim -lib/nim/compiler/packages.nim -lib/nim/compiler/parampatterns.nim -lib/nim/compiler/parser.nim -lib/nim/compiler/passaux.nim -lib/nim/compiler/passes.nim -lib/nim/compiler/pathutils.nim -lib/nim/compiler/patterns.nim -lib/nim/compiler/platform.nim -lib/nim/compiler/plugins/active.nim -lib/nim/compiler/plugins/itersgen.nim -lib/nim/compiler/plugins/locals.nim -lib/nim/compiler/pluginsupport.nim -lib/nim/compiler/pragmas.nim -lib/nim/compiler/prefixmatches.nim -lib/nim/compiler/procfind.nim -lib/nim/compiler/readme.md -lib/nim/compiler/renderer.nim -lib/nim/compiler/renderverbatim.nim -lib/nim/compiler/reorder.nim -lib/nim/compiler/rodutils.nim -lib/nim/compiler/ropes.nim -lib/nim/compiler/saturate.nim -lib/nim/compiler/scriptconfig.nim -lib/nim/compiler/sem.nim -lib/nim/compiler/semcall.nim -lib/nim/compiler/semdata.nim -lib/nim/compiler/semexprs.nim -lib/nim/compiler/semfields.nim -lib/nim/compiler/semfold.nim -lib/nim/compiler/semgnrc.nim -lib/nim/compiler/seminst.nim -lib/nim/compiler/semmacrosanity.nim -lib/nim/compiler/semmagic.nim -lib/nim/compiler/semobjconstr.nim -lib/nim/compiler/semparallel.nim -lib/nim/compiler/sempass2.nim -lib/nim/compiler/semstmts.nim -lib/nim/compiler/semtempl.nim -lib/nim/compiler/semtypes.nim -lib/nim/compiler/semtypinst.nim -lib/nim/compiler/sighashes.nim -lib/nim/compiler/sigmatch.nim -lib/nim/compiler/sinkparameter_inference.nim -lib/nim/compiler/sizealignoffsetimpl.nim -lib/nim/compiler/sourcemap.nim -lib/nim/compiler/spawn.nim -lib/nim/compiler/strutils2.nim -lib/nim/compiler/suggest.nim -lib/nim/compiler/syntaxes.nim -lib/nim/compiler/tccgen.nim -lib/nim/compiler/transf.nim -lib/nim/compiler/trees.nim -lib/nim/compiler/treetab.nim -lib/nim/compiler/typeallowed.nim -lib/nim/compiler/types.nim -lib/nim/compiler/typesrenderer.nim -lib/nim/compiler/varpartitions.nim -lib/nim/compiler/vm.nim -lib/nim/compiler/vmconv.nim -lib/nim/compiler/vmdef.nim -lib/nim/compiler/vmdeps.nim -lib/nim/compiler/vmgen.nim -lib/nim/compiler/vmhooks.nim -lib/nim/compiler/vmmarshal.nim -lib/nim/compiler/vmops.nim -lib/nim/compiler/vmprofiler.nim -lib/nim/compiler/wordrecg.nim -lib/nim/core/hotcodereloading.nim -lib/nim/core/locks.nim -lib/nim/core/macrocache.nim -lib/nim/core/macros.nim -lib/nim/core/rlocks.nim -lib/nim/core/typeinfo.nim -lib/nim/cycle.h -lib/nim/deprecated/pure/LockFreeHash.nim -lib/nim/deprecated/pure/events.nim -lib/nim/deprecated/pure/ospaths.nim -lib/nim/deprecated/pure/parseopt2.nim -lib/nim/deprecated/pure/securehash.nim -lib/nim/deprecated/pure/sharedstrings.nim -lib/nim/deps.txt -lib/nim/experimental/diff.nim -lib/nim/genode/alloc.nim -lib/nim/genode/env.nim -lib/nim/genode_cpp/syslocks.h -lib/nim/genode_cpp/threads.h -lib/nim/impure/db_mysql.nim -lib/nim/impure/db_odbc.nim -lib/nim/impure/db_postgres.nim -lib/nim/impure/db_sqlite.nim -lib/nim/impure/nre.nim -lib/nim/impure/nre/private/util.nim -lib/nim/impure/rdstdin.nim -lib/nim/impure/re.nim -lib/nim/js/asyncjs.nim -lib/nim/js/dom.nim -lib/nim/js/dom_extensions.nim -lib/nim/js/jsconsole.nim -lib/nim/js/jscore.nim -lib/nim/js/jsffi.nim -lib/nim/js/jsre.nim -lib/nim/nimbase.h -lib/nim/nimhcr.nim -lib/nim/nimhcr.nim.cfg -lib/nim/nimrtl.nim -lib/nim/nimrtl.nim.cfg -lib/nim/packages/docutils/docutils.nimble.old -lib/nim/packages/docutils/highlite.nim -lib/nim/packages/docutils/rst.nim -lib/nim/packages/docutils/rstast.nim -lib/nim/packages/docutils/rstgen.nim -lib/nim/posix/epoll.nim -lib/nim/posix/inotify.nim -lib/nim/posix/kqueue.nim -lib/nim/posix/linux.nim -lib/nim/posix/posix.nim -lib/nim/posix/posix_freertos_consts.nim -lib/nim/posix/posix_haiku.nim -lib/nim/posix/posix_linux_amd64.nim -lib/nim/posix/posix_linux_amd64_consts.nim -lib/nim/posix/posix_macos_amd64.nim -lib/nim/posix/posix_nintendoswitch.nim -lib/nim/posix/posix_nintendoswitch_consts.nim -lib/nim/posix/posix_openbsd_amd64.nim -lib/nim/posix/posix_other.nim -lib/nim/posix/posix_other_consts.nim -lib/nim/posix/posix_utils.nim -lib/nim/posix/termios.nim -lib/nim/pure/algorithm.nim -lib/nim/pure/async.nim -lib/nim/pure/asyncdispatch.nim -lib/nim/pure/asyncdispatch.nim.cfg -lib/nim/pure/asyncfile.nim -lib/nim/pure/asyncftpclient.nim -lib/nim/pure/asyncfutures.nim -lib/nim/pure/asynchttpserver.nim -lib/nim/pure/asyncmacro.nim -lib/nim/pure/asyncnet.nim -lib/nim/pure/asyncstreams.nim -lib/nim/pure/base64.nim -lib/nim/pure/bitops.nim -lib/nim/pure/browsers.nim -lib/nim/pure/cgi.nim -lib/nim/pure/collections/chains.nim -lib/nim/pure/collections/critbits.nim -lib/nim/pure/collections/deques.nim -lib/nim/pure/collections/hashcommon.nim -lib/nim/pure/collections/heapqueue.nim -lib/nim/pure/collections/intsets.nim -lib/nim/pure/collections/lists.nim -lib/nim/pure/collections/rtarrays.nim -lib/nim/pure/collections/sequtils.nim -lib/nim/pure/collections/setimpl.nim -lib/nim/pure/collections/sets.nim -lib/nim/pure/collections/sharedlist.nim -lib/nim/pure/collections/sharedtables.nim -lib/nim/pure/collections/tableimpl.nim -lib/nim/pure/collections/tables.nim -lib/nim/pure/colors.nim -lib/nim/pure/complex.nim -lib/nim/pure/concurrency/atomics.nim -lib/nim/pure/concurrency/cpuinfo.nim -lib/nim/pure/concurrency/cpuload.nim -lib/nim/pure/concurrency/threadpool.nim -lib/nim/pure/concurrency/threadpool.nim.cfg -lib/nim/pure/cookies.nim -lib/nim/pure/coro.nim -lib/nim/pure/coro.nimcfg -lib/nim/pure/cstrutils.nim -lib/nim/pure/db_common.nim -lib/nim/pure/distros.nim -lib/nim/pure/dynlib.nim -lib/nim/pure/encodings.nim -lib/nim/pure/endians.nim -lib/nim/pure/fenv.nim -lib/nim/pure/future.nim -lib/nim/pure/hashes.nim -lib/nim/pure/htmlgen.nim -lib/nim/pure/htmlparser.nim -lib/nim/pure/httpclient.nim -lib/nim/pure/httpcore.nim -lib/nim/pure/includes/osenv.nim -lib/nim/pure/includes/oserr.nim -lib/nim/pure/includes/osseps.nim -lib/nim/pure/includes/unicode_ranges.nim -lib/nim/pure/ioselects/ioselectors_epoll.nim -lib/nim/pure/ioselects/ioselectors_kqueue.nim -lib/nim/pure/ioselects/ioselectors_poll.nim -lib/nim/pure/ioselects/ioselectors_select.nim -lib/nim/pure/json.nim -lib/nim/pure/lenientops.nim -lib/nim/pure/lexbase.nim -lib/nim/pure/logging.nim -lib/nim/pure/marshal.nim -lib/nim/pure/math.nim -lib/nim/pure/md5.nim -lib/nim/pure/memfiles.nim -lib/nim/pure/mersenne.nim -lib/nim/pure/mimetypes.nim -lib/nim/pure/nativesockets.nim -lib/nim/pure/net.nim -lib/nim/pure/nimprof.nim -lib/nim/pure/nimprof.nim.cfg -lib/nim/pure/nimtracker.nim -lib/nim/pure/oids.nim -lib/nim/pure/options.nim -lib/nim/pure/os.nim -lib/nim/pure/osproc.nim -lib/nim/pure/oswalkdir.nim -lib/nim/pure/parsecfg.nim -lib/nim/pure/parsecsv.nim -lib/nim/pure/parsejson.nim -lib/nim/pure/parseopt.nim -lib/nim/pure/parsesql.nim -lib/nim/pure/parseutils.nim -lib/nim/pure/parsexml.nim -lib/nim/pure/pathnorm.nim -lib/nim/pure/pegs.nim -lib/nim/pure/prelude.nim -lib/nim/pure/punycode.nim -lib/nim/pure/random.nim -lib/nim/pure/rationals.nim -lib/nim/pure/reservedmem.nim -lib/nim/pure/ropes.nim -lib/nim/pure/segfaults.nim -lib/nim/pure/selectors.nim -lib/nim/pure/smtp.nim -lib/nim/pure/smtp.nim.cfg -lib/nim/pure/ssl_certs.nim -lib/nim/pure/ssl_config.nim -lib/nim/pure/stats.nim -lib/nim/pure/streams.nim -lib/nim/pure/streamwrapper.nim -lib/nim/pure/strformat.nim -lib/nim/pure/strmisc.nim -lib/nim/pure/strscans.nim -lib/nim/pure/strtabs.nim -lib/nim/pure/strutils.nim -lib/nim/pure/sugar.nim -lib/nim/pure/terminal.nim -lib/nim/pure/times.nim -lib/nim/pure/typetraits.nim -lib/nim/pure/unicode.nim -lib/nim/pure/unidecode/gen.py -lib/nim/pure/unidecode/unidecode.dat -lib/nim/pure/unidecode/unidecode.nim -lib/nim/pure/unittest.nim -lib/nim/pure/uri.nim -lib/nim/pure/volatile.nim -lib/nim/pure/xmlparser.nim -lib/nim/pure/xmltree.nim -lib/nim/std/compilesettings.nim -lib/nim/std/decls.nim -lib/nim/std/editdistance.nim -lib/nim/std/effecttraits.nim -lib/nim/std/enumerate.nim -lib/nim/std/enumutils.nim -lib/nim/std/exitprocs.nim -lib/nim/std/genasts.nim -lib/nim/std/importutils.nim -lib/nim/std/isolation.nim -lib/nim/std/jsbigints.nim -lib/nim/std/jsfetch.nim -lib/nim/std/jsformdata.nim -lib/nim/std/jsheaders.nim -lib/nim/std/jsonutils.nim -lib/nim/std/logic.nim -lib/nim/std/monotimes.nim -lib/nim/std/packedsets.nim -lib/nim/std/private/asciitables.nim -lib/nim/std/private/bitops_utils.nim -lib/nim/std/private/dbutils.nim -lib/nim/std/private/decode_helpers.nim -lib/nim/std/private/digitsutils.nim -lib/nim/std/private/gitutils.nim -lib/nim/std/private/globs.nim -lib/nim/std/private/jsutils.nim -lib/nim/std/private/miscdollars.nim -lib/nim/std/private/since.nim -lib/nim/std/private/strimpl.nim -lib/nim/std/private/underscored_calls.nim -lib/nim/std/private/win_setenv.nim -lib/nim/std/setutils.nim -lib/nim/std/sha1.nim -lib/nim/std/socketstreams.nim -lib/nim/std/stackframes.nim -lib/nim/std/strbasics.nim -lib/nim/std/sums.nim -lib/nim/std/sysrand.nim -lib/nim/std/tasks.nim -lib/nim/std/tempfiles.nim -lib/nim/std/time_t.nim -lib/nim/std/varints.nim -lib/nim/std/vmutils.nim -lib/nim/std/with.nim -lib/nim/std/wordwrap.nim -lib/nim/std/wrapnils.nim -lib/nim/stdlib.nimble -lib/nim/system.nim -lib/nim/system/alloc.nim -lib/nim/system/ansi_c.nim -lib/nim/system/arc.nim -lib/nim/system/arithm.nim -lib/nim/system/arithmetics.nim -lib/nim/system/assertions.nim -lib/nim/system/assign.nim -lib/nim/system/atomics.nim -lib/nim/system/avltree.nim -lib/nim/system/basic_types.nim -lib/nim/system/bitmasks.nim -lib/nim/system/cellseqs_v1.nim -lib/nim/system/cellseqs_v2.nim -lib/nim/system/cellsets.nim -lib/nim/system/cgprocs.nim -lib/nim/system/channels_builtin.nim -lib/nim/system/chcks.nim -lib/nim/system/comparisons.nim -lib/nim/system/coro_detection.nim -lib/nim/system/countbits_impl.nim -lib/nim/system/cyclebreaker.nim -lib/nim/system/deepcopy.nim -lib/nim/system/dollars.nim -lib/nim/system/dragonbox.nim -lib/nim/system/dyncalls.nim -lib/nim/system/embedded.nim -lib/nim/system/exceptions.nim -lib/nim/system/excpt.nim -lib/nim/system/fatal.nim -lib/nim/system/formatfloat.nim -lib/nim/system/gc.nim -lib/nim/system/gc2.nim -lib/nim/system/gc_common.nim -lib/nim/system/gc_hooks.nim -lib/nim/system/gc_interface.nim -lib/nim/system/gc_ms.nim -lib/nim/system/gc_regions.nim -lib/nim/system/hti.nim -lib/nim/system/inclrtl.nim -lib/nim/system/indexerrors.nim -lib/nim/system/integerops.nim -lib/nim/system/io.nim -lib/nim/system/iterators.nim -lib/nim/system/iterators_1.nim -lib/nim/system/jssys.nim -lib/nim/system/memalloc.nim -lib/nim/system/memory.nim -lib/nim/system/memtracker.nim -lib/nim/system/mm/boehm.nim -lib/nim/system/mm/go.nim -lib/nim/system/mm/malloc.nim -lib/nim/system/mm/none.nim -lib/nim/system/mmdisp.nim -lib/nim/system/nimscript.nim -lib/nim/system/orc.nim -lib/nim/system/osalloc.nim -lib/nim/system/platforms.nim -lib/nim/system/profiler.nim -lib/nim/system/repr.nim -lib/nim/system/repr_impl.nim -lib/nim/system/repr_v2.nim -lib/nim/system/reprjs.nim -lib/nim/system/schubfach.nim -lib/nim/system/seqs_v2.nim -lib/nim/system/seqs_v2_reimpl.nim -lib/nim/system/setops.nim -lib/nim/system/sets.nim -lib/nim/system/stacktraces.nim -lib/nim/system/strmantle.nim -lib/nim/system/strs_v2.nim -lib/nim/system/syslocks.nim -lib/nim/system/sysspawn.nim -lib/nim/system/sysstr.nim -lib/nim/system/threadlocalstorage.nim -lib/nim/system/threads.nim -lib/nim/system/timers.nim -lib/nim/system/widestrs.nim -lib/nim/system_overview.rst -lib/nim/windows/registry.nim -lib/nim/windows/winlean.nim -lib/nim/wrappers/linenoise/LICENSE.txt -lib/nim/wrappers/linenoise/README.markdown -lib/nim/wrappers/linenoise/linenoise.c -lib/nim/wrappers/linenoise/linenoise.h -lib/nim/wrappers/linenoise/linenoise.nim -lib/nim/wrappers/mysql.nim -lib/nim/wrappers/odbcsql.nim -lib/nim/wrappers/openssl.nim *** 1369 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308310943.37V9hqZK066799>