On Fri, Apr 10, 2020 at 09:41:53PM +0200, Denis Fondras wrote:
> On Fri, Apr 10, 2020 at 12:12:58AM +0530, putridsou...@gmail.com wrote:
> > Latest Update for nim-1.2.0
> > Builds successfully on amd64
> >
> > 1 new patch added -> patch-install_sh
> > 4 patches removed -> patch-koch_nim, patch-lib_pure_endians_nim,
> > patch-compiler_extccomp_nim,
> > patch-tests_testament_tester_nim
> >
> > Someone should test this.
> >
>
> It does not work here unless I copy /etc/nim* to /usr/local/etc/nim/
>
Here is a new diff. Add config files to /usr/local/etc/nim and add nimble to the
package.
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/nim/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 31 Aug 2019 15:36:56 -0000 1.10
+++ Makefile 12 Apr 2020 08:50:34 -0000
@@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
COMMENT = statically typed, imperative programming language
-VERSION = 0.16.0
+VERSION = 1.2.0
DISTNAME = nim-${VERSION}
EXTRACT_SUFX = .tar.xz
REVISION = 0
@@ -39,15 +39,21 @@ do-build:
cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
--listCmd --putenv:"PATH=${PATH}"
+ cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \
+ --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
+ --listCmd --putenv:"PATH=${PATH}"
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nim
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
+ ${INSTALL_DATA_DIR} ${PREFIX}/etc/nim
+ ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/etc/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nim
${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 9 Jan 2017 10:32:33 -0000 1.4
+++ distinfo 12 Apr 2020 08:50:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
-SIZE (nim-0.16.0.tar.xz) = 2907076
+SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
+SIZE (nim-1.2.0.tar.xz) = 5869428
Index: patches/patch-build_sh
===================================================================
RCS file: /cvs/ports/lang/nim/patches/patch-build_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-build_sh
--- patches/patch-build_sh 15 Jun 2016 00:19:59 -0000 1.2
+++ patches/patch-build_sh 12 Apr 2020 08:50:34 -0000
@@ -1,16 +1,15 @@
$OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
--- build.sh.orig Tue Jun 7 00:38:53 2016
+++ build.sh Thu Jun 9 19:43:03 2016
-@@ -26,9 +26,9 @@ do
- esac
- done
-
--CC="gcc"
--LINKER="gcc"
--COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3
-fno-strict-aliasing$extraBuildArgs"
-+#CC="gcc"
-+#LINKER="gcc"
-+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fno-strict-aliasing$extraBuildArgs"
- LINK_FLAGS="${LDFLAGS:-} "
- PS4=""
- # platform detection
+@@ -89,6 +89,11 @@
+ ;;
+ *openbsd* )
+ myos="openbsd"
++ if [ "$ucpu" = "powerpc" ] ; then
++ CC="gcc"
++ else
++ CC="clang"
++ fi
+ LINK_FLAGS="$LINK_FLAGS -lm"
+ ;;
+ *netbsd* )
Index: patches/patch-compiler_extccomp_nim
===================================================================
RCS file: patches/patch-compiler_extccomp_nim
diff -N patches/patch-compiler_extccomp_nim
--- patches/patch-compiler_extccomp_nim 9 Jan 2017 10:32:33 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra Exp $
---- compiler/extccomp.nim.orig Sun Jan 8 21:33:43 2017
-+++ compiler/extccomp.nim Mon Jan 9 02:22:00 2017
-@@ -21,7 +21,7 @@ import
- type
- TSystemCC* = enum
- ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
-- ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
-+ ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
- TInfoCCProp* = enum # properties of the C compiler:
- hasSwitchRange, # CC allows ranges in switch statements (GNU C)
- hasComputedGoto, # CC has computed goto (GNU C extension)
-@@ -69,8 +69,8 @@ compiler gcc:
- result = (
- name: "gcc",
- objExt: "o",
-- optSpeed: " -O3 -ffast-math ",
-- optSize: " -Os -ffast-math ",
-+ optSpeed: " -O2 ",
-+ optSize: " -Os ",
- compilerExe: "gcc",
- cppCompiler: "g++",
- compileTmpl: "-c $options $include -o $objfile $file",
-@@ -90,6 +90,13 @@ compiler gcc:
- props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard, hasGnuAsm,
- hasAttribute})
-
-+compiler egcc:
-+ result = gcc()
-+
-+ result.name = "egcc"
-+ result.compilerExe = "egcc"
-+ result.cppCompiler = "eg++"
-+
- # LLVM Frontend for GCC/G++
- compiler llvmGcc:
- result = gcc() # Uses settings from GCC
-@@ -359,7 +366,8 @@ const
- pcc(),
- ucc(),
- icl(),
-- fasm()]
-+ fasm(),
-+ egcc()]
-
- hExt* = ".h"
-
Index: patches/patch-config_nim_cfg
===================================================================
RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v
retrieving revision 1.3
diff -u -p -r1.3 patch-config_nim_cfg
--- patches/patch-config_nim_cfg 9 Jan 2017 10:32:33 -0000 1.3
+++ patches/patch-config_nim_cfg 12 Apr 2020 08:50:34 -0000
@@ -1,56 +1,25 @@
$OpenBSD: patch-config_nim_cfg,v 1.3 2017/01/09 10:32:33 juanfra Exp $
--- config/nim.cfg.orig Sun Jan 8 21:33:42 2017
+++ config/nim.cfg Mon Jan 9 02:28:32 2017
-@@ -76,7 +76,7 @@ path="$lib/pure"
- @end
- @if bsd or haiku:
- # BSD got posix_spawn only recently, so we deactivate it for osproc:
-- define:useFork
-+ #define:useFork
- # at least NetBSD has problems with thread local storage:
- tlsEmulation:on
- @end
-@@ -112,6 +112,8 @@ path="$lib/pure"
- @else:
- gcc.options.always = "-w"
- gcc.cpp.options.always = "-w -fpermissive"
-+ egcc.options.always = "-w"
-+ egpp.options.alaways = "-w -fpermissive"
- @end
-
- # Configuration for Objective-C compiler:
-@@ -155,18 +157,23 @@ clang.objc.options.linker = "-lobjc -lgnustep-base"
- gcc.options.linker %= "-L $WIND_BASE/target/lib/usr/lib/ppc/PPC32/common
-mrtp -fno-strict-aliasing -D_C99 -D_HAS_C9X -std=c99 -fasm -Wall
-Wno-write-strings"
- @end
+@@ -8,7 +8,7 @@
+ # Environment variables can be accessed like so:
+ # gcc.path %= "$CC_PATH"
--gcc.options.speed = "-O3 -fno-strict-aliasing"
-+gcc.options.speed = "-O2 -fno-strict-aliasing"
- gcc.options.size = "-Os"
- @if windows:
- gcc.options.debug = "-g3 -O0 -gdwarf-3"
- @else:
- gcc.options.debug = "-g3 -O0"
- @end
--gcc.cpp.options.speed = "-O3 -fno-strict-aliasing"
-+gcc.cpp.options.speed = "-O2 -fno-strict-aliasing"
- gcc.cpp.options.size = "-Os"
- gcc.cpp.options.debug = "-g3 -O0"
- #passl = "-pg"
+-cc = gcc
++cc = clang
-+# Configuration for the OpenBSD ports GCC compiler:
-+egcc.options.speed = "-O2 -fno-strict-aliasing"
-+egcc.options.size = "-Os"
-+egcc.options.debug = "-g3 -O0"
-+
- # Configuration for the LLVM GCC compiler:
- llvm_gcc.options.debug = "-g"
- llvm_gcc.options.always = "-w"
-@@ -176,7 +183,7 @@ llvm_gcc.options.size = "-Os"
- # Configuration for the LLVM CLang compiler:
- clang.options.debug = "-g"
- clang.options.always = "-w"
--clang.options.speed = "-O3"
-+clang.options.speed = "-O2"
- clang.options.size = "-Os"
-
- # Configuration for the Visual C/C++ compiler:
+ # additional options always passed to the compiler:
+ --parallel_build: "0" # 0 to auto-detect number of processors
+@@ -118,12 +118,6 @@ path="$lib/pure"
+ clang.options.linker = "-ldl"
+ clang.cpp.options.linker = "-ldl"
+ tcc.options.linker = "-ldl"
+- @end
+- @if bsd:
+- # BSD got posix_spawn only recently, so we deactivate it for osproc:
+- define:useFork
+- # at least NetBSD has problems with thread local storage:
+- tlsEmulation:on
+ @end
+ @if haiku:
+ gcc.options.linker = "-Wl,--as-needed -lnetwork"
Index: patches/patch-install_sh
===================================================================
RCS file: patches/patch-install_sh
diff -N patches/patch-install_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-install_sh 12 Apr 2020 08:50:34 -0000
@@ -0,0 +1,70 @@
+--- install.sh.orig 2020-04-03 17:25:49 UTC
++++ install.sh
+@@ -15,48 +15,14 @@ if [ $# -eq 1 ] ; then
+ "--help"|"-h"|"help"|"h")
+ echo "Nim installation script"
+ echo "Usage: [sudo] sh install.sh DIR"
+- echo "Where DIR may be:"
+- echo " /usr/bin"
+- echo " /usr/local/bin"
+- echo " /opt"
+- echo " <some other dir> (treated similar to '/opt')"
+- echo "To deinstall, use the command:"
+- echo "sh deinstall.sh DIR"
+ exit 1
+ ;;
+- "/usr/bin")
+- bindir=/usr/bin
+- configdir=/etc/nim
+- libdir=/usr/lib/nim
+- docdir=/usr/share/nim/doc
+- datadir=/usr/share/nim/data
+- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
+- ;;
+- "/usr/local/bin")
+- bindir=/usr/local/bin
+- configdir=/etc/nim
+- libdir=/usr/local/lib/nim
+- docdir=/usr/local/share/nim/doc
+- datadir=/usr/local/share/nim/data
+- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
+- ;;
+- "/opt")
+- bindir="/opt/nim/bin"
+- configdir="/opt/nim/config"
+- libdir="/opt/nim/lib"
+- docdir="/opt/nim/doc"
+- datadir="/opt/nim/data"
+- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
+- mkdir -p /opt/nim
+- mkdir -p $bindir
+- mkdir -p $configdir
+- ;;
+ *)
+- bindir="$1/nim/bin"
+- configdir="$1/nim/config"
+- libdir="$1/nim/lib"
+- docdir="$1/nim/doc"
+- datadir="$1/nim/data"
++ bindir="$1/bin"
++ configdir="$1/etc/nim"
++ libdir="$1/lib"
++ docdir="$1/share/doc/nim"
++ datadir="$1/share/nim"
+ nimbleDir="$1/nim"
+ mkdir -p $1/nim
+ mkdir -p $bindir
+@@ -973,13 +939,6 @@ chmod 644 $nimbleDir/compiler.nimble
+ else
+ echo "Nim installation script"
+ echo "Usage: [sudo] sh install.sh DIR"
+- echo "Where DIR may be:"
+- echo " /usr/bin"
+- echo " /usr/local/bin"
+- echo " /opt"
+- echo " <some other dir> (treated similar to '/opt')"
+- echo "To deinstall, use the command:"
+- echo "sh deinstall.sh DIR"
+ exit 1
+ fi
+
Index: patches/patch-koch_nim
===================================================================
RCS file: patches/patch-koch_nim
diff -N patches/patch-koch_nim
--- patches/patch-koch_nim 9 Jan 2017 10:32:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-koch_nim,v 1.2 2017/01/09 10:32:33 juanfra Exp $
---- koch.nim.orig Sun Jan 8 21:33:42 2017
-+++ koch.nim Mon Jan 9 03:15:50 2017
-@@ -393,7 +393,7 @@ proc tests(args: string) =
- nimexec "cc --taintMode:on tests/testament/tester"
- # Since tests take a long time (on my machine), and we want to defy Murhpys
- # law - lets make sure the compiler really is freshly compiled!
-- nimexec "c --lib:lib -d:release --opt:speed compiler/nim.nim"
-+ nimexec "c --lib:lib -d:release --opt:speed --listFullPaths --listCmd
--putenv:PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin::
--nimcache:/usr/write-ports/pobj/nim-0.16.0/nim-0.16.0/nimcache-port-test
compiler/nim.nim"
- let tester = quoteShell(getCurrentDir() / "tests/testament/tester".exe)
- let success = tryExec tester & " " & (args|"all")
- if not existsEnv("TRAVIS") and not existsEnv("APPVEYOR"):
Index: patches/patch-lib_pure_endians_nim
===================================================================
RCS file: patches/patch-lib_pure_endians_nim
diff -N patches/patch-lib_pure_endians_nim
--- patches/patch-lib_pure_endians_nim 9 Jan 2017 10:32:33 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lib_pure_endians_nim,v 1.1 2017/01/09 10:32:33 juanfra Exp $
-
-GCC 4.2 doesn't support __builtin_bswap32. Enable it only for egcc.
-
---- lib/pure/endians.nim.orig Mon Jan 9 03:16:08 2017
-+++ lib/pure/endians.nim Mon Jan 9 03:16:28 2017
-@@ -10,7 +10,7 @@
- ## This module contains helpers that deal with different byte orders
- ## (`endian`:idx:).
-
--when defined(gcc) or defined(llvm_gcc) or defined(clang):
-+when defined(egcc) or defined(llvm_gcc) or defined(clang):
- const useBuiltinSwap = true
- proc builtin_bswap16(a: uint16): uint16 {.
- importc: "__builtin_bswap16", nodecl, nosideeffect.}
Index: patches/patch-tests_testament_tester_nim
===================================================================
RCS file: patches/patch-tests_testament_tester_nim
diff -N patches/patch-tests_testament_tester_nim
--- patches/patch-tests_testament_tester_nim 9 Jan 2017 10:32:33 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_testament_tester_nim,v 1.3 2017/01/09 10:32:33 juanfra
Exp $
-
-"compiler/nodejs" breaks the tests:
-
-"tester.nim(15, 22) Error: cannot open 'compiler/nodejs'
-nim cc --taintMode:on tests/testament/tester
-FAILURE
-Error 1 in . (Makefile:42 'do-test')"
-
---- tests/testament/tester.nim.orig Sun Jan 8 21:33:43 2017
-+++ tests/testament/tester.nim Mon Jan 9 02:33:36 2017
-@@ -12,7 +12,7 @@
- import
- parseutils, strutils, pegs, os, osproc, streams, parsecfg, json,
- marshal, backend, parseopt, specs, htmlgen, browsers, terminal,
-- algorithm, compiler/nodejs, re, times, sets
-+ algorithm, re, times, sets
-
- const
- resultsFile = "testresults.html"
-@@ -326,7 +326,7 @@ proc testSpec(r: var TResults, test: TTest) =
- r.addResult(test, expected.outp, "executable not found", reExeNotFound)
- return
-
-- let nodejs = if isJsTarget: findNodeJs() else: ""
-+ let nodejs = if isJsTarget: "" else: ""
- if isJsTarget and nodejs == "":
- r.addResult(test, expected.outp, "nodejs binary not in PATH",
- reExeNotFound)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/nim/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 29 May 2018 08:10:42 -0000 1.4
+++ pkg/PLIST 12 Apr 2020 08:50:34 -0000
@@ -2,31 +2,41 @@
@conflict nimrod-<0.11.2
@pkgpath lang/nimrod
@bin bin/nim
+@bin bin/nimble
+etc/
+etc/nim/
+etc/nim/nim.cfg
+etc/nim/nimdoc.cfg
+etc/nim/nimdoc.tex.cfg
lib/nim/
lib/nim/arch/
-lib/nim/arch/arch.nim
-lib/nim/arch/i386.asm
-lib/nim/arch/ms_amd64.asm
-lib/nim/arch/ms_i386.asm
-lib/nim/arch/unix_amd64.asm
-lib/nim/arch/unix_i386.asm
+lib/nim/arch/x86/
+lib/nim/arch/x86/amd64.S
+lib/nim/arch/x86/i386.S
lib/nim/core/
+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/
-lib/nim/deprecated/core/
-lib/nim/deprecated/core/unsigned.nim
lib/nim/deprecated/pure/
-lib/nim/deprecated/pure/actors.nim
-lib/nim/deprecated/pure/actors.nim.cfg
-lib/nim/deprecated/pure/asyncio.nim
-lib/nim/deprecated/pure/ftpclient.nim
-lib/nim/deprecated/pure/parseurl.nim
-lib/nim/deprecated/pure/rawsockets.nim
-lib/nim/deprecated/pure/sockets.nim
+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/experimental/
+lib/nim/experimental/diff.nim
+lib/nim/genode/
+lib/nim/genode/alloc.nim
+lib/nim/genode/env.nim
+lib/nim/genode_cpp/
+lib/nim/genode_cpp/syslocks.h
+lib/nim/genode_cpp/threads.h
lib/nim/impure/
lib/nim/impure/db_mysql.nim
lib/nim/impure/db_odbc.nim
@@ -36,20 +46,24 @@ lib/nim/impure/nre/
lib/nim/impure/nre.nim
lib/nim/impure/nre/private/
lib/nim/impure/nre/private/util.nim
-lib/nim/impure/osinfo_posix.nim
-lib/nim/impure/osinfo_win.nim
lib/nim/impure/rdstdin.nim
lib/nim/impure/re.nim
-lib/nim/impure/ssl.nim
lib/nim/js/
+lib/nim/js/asyncjs.nim
lib/nim/js/dom.nim
lib/nim/js/jsconsole.nim
+lib/nim/js/jscore.nim
+lib/nim/js/jsffi.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/nintendoswitch/
+lib/nim/nintendoswitch/switch_memory.nim
lib/nim/packages/
lib/nim/packages/docutils/
-lib/nim/packages/docutils/docutils.babel
+lib/nim/packages/docutils/docutils.nimble
lib/nim/packages/docutils/highlite.nim
lib/nim/packages/docutils/rst.nim
lib/nim/packages/docutils/rstast.nim
@@ -60,42 +74,53 @@ lib/nim/posix/inotify.nim
lib/nim/posix/kqueue.nim
lib/nim/posix/linux.nim
lib/nim/posix/posix.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/prelude.nim
lib/nim/pure/
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/basic2d.nim
-lib/nim/pure/basic3d.nim
+lib/nim/pure/bitops.nim
lib/nim/pure/browsers.nim
lib/nim/pure/cgi.nim
lib/nim/pure/collections/
-lib/nim/pure/collections/LockFreeHash.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/queues.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/sharedstrings.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/
+lib/nim/pure/concurrency/atomics.nim
lib/nim/pure/concurrency/cpuinfo.nim
lib/nim/pure/concurrency/cpuload.nim
lib/nim/pure/concurrency/threadpool.nim
@@ -103,37 +128,34 @@ lib/nim/pure/concurrency/threadpool.nim.
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
-@comment lib/nim/pure/endians.nim.orig
-lib/nim/pure/etcpriv.nim
-lib/nim/pure/events.nim
lib/nim/pure/fenv.nim
-lib/nim/pure/fsmonitor.nim
lib/nim/pure/future.nim
-lib/nim/pure/gentabs.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/httpserver.nim
lib/nim/pure/includes/
-lib/nim/pure/includes/asyncfutures.nim
-lib/nim/pure/ioselectors.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/
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/matchers.nim
lib/nim/pure/math.nim
lib/nim/pure/md5.nim
lib/nim/pure/memfiles.nim
@@ -144,39 +166,38 @@ lib/nim/pure/net.nim
lib/nim/pure/nimprof.nim
lib/nim/pure/nimprof.nim.cfg
lib/nim/pure/nimtracker.nim
-lib/nim/pure/numeric.nim
lib/nim/pure/oids.nim
lib/nim/pure/options.nim
lib/nim/pure/os.nim
-lib/nim/pure/ospaths.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/parseopt2.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/poly.nim
lib/nim/pure/punycode.nim
lib/nim/pure/random.nim
lib/nim/pure/rationals.nim
-lib/nim/pure/romans.nim
+lib/nim/pure/reservedmem.nim
lib/nim/pure/ropes.nim
-lib/nim/pure/scgi.nim
-lib/nim/pure/securehash.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/stats.nim
lib/nim/pure/streams.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/subexes.nim
+lib/nim/pure/sugar.nim
lib/nim/pure/terminal.nim
lib/nim/pure/times.nim
lib/nim/pure/typetraits.nim
@@ -187,88 +208,122 @@ 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/xmldom.nim
-lib/nim/pure/xmldomparser.nim
+lib/nim/pure/volatile.nim
lib/nim/pure/xmlparser.nim
lib/nim/pure/xmltree.nim
+lib/nim/std/
+lib/nim/std/compilesettings.nim
+lib/nim/std/decls.nim
+lib/nim/std/editdistance.nim
+lib/nim/std/logic.nim
+lib/nim/std/monotimes.nim
+lib/nim/std/private/
+lib/nim/std/private/underscored_calls.nim
+lib/nim/std/sha1.nim
+lib/nim/std/stackframes.nim
+lib/nim/std/sums.nim
+lib/nim/std/time_t.nim
+lib/nim/std/varints.nim
+lib/nim/std/with.nim
+lib/nim/std/wordwrap.nim
+lib/nim/std/wrapnils.nim
lib/nim/stdlib.nimble
lib/nim/system/
lib/nim/system.nim
lib/nim/system/alloc.nim
lib/nim/system/ansi_c.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/cellsets.nim
lib/nim/system/cgprocs.nim
lib/nim/system/channels.nim
lib/nim/system/chcks.nim
-lib/nim/system/debugger.nim
+lib/nim/system/comparisons.nim
+lib/nim/system/cyclebreaker.nim
+lib/nim/system/cyclicrefs_v2.nim
lib/nim/system/deepcopy.nim
+lib/nim/system/dollars.nim
lib/nim/system/dyncalls.nim
lib/nim/system/embedded.nim
-lib/nim/system/endb.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_stack.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/
+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/osalloc.nim
lib/nim/system/platforms.nim
lib/nim/system/profiler.nim
+lib/nim/system/refs_v2.nim
lib/nim/system/repr.nim
+lib/nim/system/repr_v2.nim
lib/nim/system/reprjs.nim
+lib/nim/system/seqs_v2.nim
+lib/nim/system/setops.nim
lib/nim/system/sets.nim
-lib/nim/system/sysio.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/upcoming/
-lib/nim/upcoming/asyncdispatch.nim
+lib/nim/system_overview.rst
lib/nim/windows/
lib/nim/windows/registry.nim
lib/nim/windows/winlean.nim
lib/nim/wrappers/
lib/nim/wrappers/iup.nim
-lib/nim/wrappers/joyent_http_parser.nim
-lib/nim/wrappers/libsvm.nim
-lib/nim/wrappers/libuv.nim
lib/nim/wrappers/linenoise/
lib/nim/wrappers/linenoise/LICENSE.txt
lib/nim/wrappers/linenoise/README.markdown
-lib/nim/wrappers/linenoise/clinenoise.c
-lib/nim/wrappers/linenoise/clinenoise.h
+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
lib/nim/wrappers/pcre.nim
-lib/nim/wrappers/pdcurses.nim
lib/nim/wrappers/postgres.nim
lib/nim/wrappers/sqlite3.nim
lib/nim/wrappers/tinyc.nim
share/doc/nim/
share/doc/nim/advopt.txt
-share/doc/nim/apis.txt
share/doc/nim/astspec.txt
-share/doc/nim/backends.txt
share/doc/nim/basicopt.txt
share/doc/nim/effects.txt
-share/doc/nim/exception_hierarchy_fragment.txt
share/doc/nim/filelist.txt
share/doc/nim/grammar.txt
-share/doc/nim/intern.txt
share/doc/nim/keywords.txt
share/doc/nim/pegdocs.txt
share/doc/nim/readme.txt
@@ -276,11 +331,7 @@ share/doc/nim/regexprs.txt
share/doc/nim/sets_fragment.txt
share/doc/nim/spawn.txt
share/doc/nim/subexes.txt
-share/doc/nim/tools.txt
share/examples/nim/
share/examples/nim/nim.cfg
-@sample ${SYSCONFDIR}/nim.cfg
share/examples/nim/nimdoc.cfg
-@sample ${SYSCONFDIR}/nimdoc.cfg
share/examples/nim/nimdoc.tex.cfg
-@sample ${SYSCONFDIR}/nimdoc.tex.cfg
