nim: Update to 1.2.2

Changelog:
Bugfixes

    Fixed “Critical: 1 completed Future, multiple await: Only 1 await will be awakened (the last one)” (#13889)
    Fixed ““distinct uint64” type corruption on 32-bit, when using {.borrow.} operators” (#13902)
    Fixed “Regression: impossible to use typed pragmas with proc types” (#13909)
    Fixed “openssl wrapper corrupts stack on OpenSSL 1.1.1f + Android” (#13903)
    Fixed “add nimExe to nim dump” (#13876)
    Fixed “simple ‘var openarray[char]’ assignment crash when the openarray source is a local string and using gc:arc” (#14003)
    Fixed “Cant use expressions with when in type sections.” (#14007)
    Fixed “Annoying warning: inherit from a more precise exception type like ValueError, IOError or OSError [InheritFromException]” (#14052)
    Fixed “Incorrect escape sequence for example in jsffi library documentation” (#14110)
    Fixed “macOS: dsymutil should not be called on static libraries” (#14132)
    Fixed “Fix single match output” (#12920)
    Fixed “algorithm.sortedByIt template corrupts tuple input under –gc:arc” (#14079)
    Fixed “strformat: doc example fails” (#14054)
    Fixed “Nim doc fail to run for nim 1.2.0 (nim 1.0.4 is ok)” (#13986)
    Fixed “Exception when converting csize to clong” (#13698)
    Fixed “[ARC] Segfault with cyclic references (?)” (#14159)
    Fixed “cas is wrong for tcc” (#14151)
    Fixed “Use -d:nimEmulateOverflowChecks by default?” (#14209)
    Fixed “Invalid return value of openProcess is NULL rather than INVALID_HANDLE_VALUE(-1) in windows” (#14289)
    Fixed “nim-gdb is missing from all released packages” (#13104)
    Fixed “compiler error with inline async proc and pragma” (#13998)
    Fixed “Linker error with closures” (#209)
    Fixed “ARC codegen bug with inline iterators” (#14219)
    Fixed “[ARC] implicit move on last use happening on non-last use” (#14269)
    Fixed “Boehm GC does not scan thread-local storage” (#14364)
    Fixed “RVO not exception safe” (#14126)
    Fixed “ARC: unreliable setLen “ (#14495)
    Fixed “lent is unsafe: after #14447 you can modify variables with “items” loop for sequences” (#14498)
    Fixed “moveFile does not overwrite destination file” (#14057)
    Fixed “var op = fn() wrongly gives warning ObservableStores with object of RootObj type” (#14514)
    Fixed “wrapWords seems to ignore linebreaks when wrapping, leaving breaks in the wrong place” (#14579)

5 files changed, 55 insertions, 12 deletions

diff --git a/lang/nim/Makefile b/lang/nim/Makefile
index 1f056bdf803..2755b3c2f25 100644
--- a/lang/nim/Makefile
+++ b/lang/nim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2020/06/14 16:15:54 nikita Exp $
+# $NetBSD: Makefile,v 1.16 2020/06/21 07:43:29 ryoon Exp $
 
-DISTNAME=	nim-1.2.0
-PKGREVISION=	1
+DISTNAME=	nim-1.2.2
 CATEGORIES=	lang
 MASTER_SITES=	http://nim-lang.org/download/
 EXTRACT_SUFX=	.tar.xz
@@ -11,8 +10,16 @@ HOMEPAGE=	https://nim-lang.org/
 COMMENT=	The Nim programming language
 LICENSE=	mit
 
+DEPENDS+=	coreutils-[0-9]*:../../sysutils/coreutils
+
+USE_TOOLS+=	bash
+REPLACE_BASH+=	bin/nim-gdb
+
 INSTALLATION_DIRS=	bin
 
+post-patch:
+	cd ${WRKSRC}/bin && ${LN} -sf nim-gdb nim-gdb.bash
+
 do-build:
 	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} sh ./build.sh
 	printf '#! %s\nexec %s _=%s/nim/bin/nim %s/nim/bin/nim "$$@"\n' \
diff --git a/lang/nim/PLIST b/lang/nim/PLIST
index 9e98ef7fa57..0c767372699 100644
--- a/lang/nim/PLIST
+++ b/lang/nim/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.10 2020/05/11 19:08:59 nikita Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/06/21 07:43:29 ryoon Exp $
 bin/nim
-nim/bin/nim
 bin/nimble
 bin/nimfind
 bin/nimgrep
 bin/nimpretty
 bin/nimsuggest
 bin/testament
+nim/bin/nim
+nim/bin/nim-gdb
+nim/bin/nim-gdb.bash
 nim/compiler.nimble
 nim/compiler/aliases.nim
 nim/compiler/asciitables.nim
@@ -19,6 +21,7 @@ nim/compiler/ccgcalls.nim
 nim/compiler/ccgexprs.nim
 nim/compiler/ccgliterals.nim
 nim/compiler/ccgmerge.nim
+nim/compiler/ccgreset.nim
 nim/compiler/ccgstmts.nim
 nim/compiler/ccgthreadvars.nim
 nim/compiler/ccgtrav.nim
diff --git a/lang/nim/buildlink3.mk b/lang/nim/buildlink3.mk
index efafc275c0e..547d944690a 100644
--- a/lang/nim/buildlink3.mk
+++ b/lang/nim/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/05/11 19:45:54 nikita Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/06/21 07:43:29 ryoon Exp $
 
 BUILDLINK_TREE+=	nim
 
 .if !defined(NIM_BUILDLINK3_MK)
 NIM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.nim+=	nim>=1.2.0
+BUILDLINK_API_DEPENDS.nim=	nim>=1.2.0
 BUILDLINK_ABI_DEPENDS.nim?=	nim>=1.2.0
 BUILDLINK_PKGSRCDIR.nim?=	../../lang/nim
 
diff --git a/lang/nim/distinfo b/lang/nim/distinfo
index 85b268a52ae..88cf6ae4ffd 100644
--- a/lang/nim/distinfo
+++ b/lang/nim/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2020/04/05 01:29:15 ryoon Exp $
+$NetBSD: distinfo,v 1.12 2020/06/21 07:43:29 ryoon Exp $
 
-SHA1 (nim-1.2.0.tar.xz) = 4c9c01c4598503359b3db1e326390e8502d750e4
-RMD160 (nim-1.2.0.tar.xz) = ab4a35587303a07a32256d9f282db9905a5688a3
-SHA512 (nim-1.2.0.tar.xz) = 7803a0e11a0e83d442c06af6135b446329bb005c2717aabd03c82b80d9dcac5305ae67972129fd830e91251ce4c746b805ccbf0bb220873b39faf4f342cbaf6f
-Size (nim-1.2.0.tar.xz) = 5869428 bytes
+SHA1 (nim-1.2.2.tar.xz) = ffda7d9d9750339e27a20f803a214ca840348034
+RMD160 (nim-1.2.2.tar.xz) = 01202dce1e08cc7cfbccdb6b405b4e09eb0a3d5d
+SHA512 (nim-1.2.2.tar.xz) = 95f7b03a091113382298d438d27641cf612fc187a29bda66c3b88a4b6d29f5c20a33dd22c63cbd402f4ccd921bf05fbd144a8bea9c6155ab865b4b5d14b93a13
+Size (nim-1.2.2.tar.xz) = 5680316 bytes
+SHA1 (patch-bin_nim-gdb) = 0d4e9ae4cc8687ca7821891b63808fa1d175069c
diff --git a/lang/nim/patches/patch-bin_nim-gdb b/lang/nim/patches/patch-bin_nim-gdb
new file mode 100644
index 00000000000..74569a35555
--- /dev/null
+++ b/lang/nim/patches/patch-bin_nim-gdb
@@ -0,0 +1,32 @@
+$NetBSD: patch-bin_nim-gdb,v 1.1 2020/06/21 07:43:29 ryoon Exp $
+
+--- bin/nim-gdb.orig	2020-06-20 10:43:35.534552652 +0000
++++ bin/nim-gdb
+@@ -0,0 +1,27 @@
++#!/usr/bin/env bash
++
++# Exit if anything fails
++set -e
++
++which nim > /dev/null || (echo "nim not in PATH"; exit 1)
++which gdb > /dev/null || (echo "gdb not in PATH"; exit 1)
++
++if [[ "$(uname -s)" == "Darwin" || "$(uname -s)" == *"BSD" ]]; then
++  which greadlink > /dev/null || (echo "readlink not in PATH. Please install coreutils from homebrew."; exit 1)
++  READLINK=greadlink
++else
++  which readlink > /dev/null || (echo "readlink not in PATH."; exit 1)
++  READLINK=readlink
++fi
++
++# Find out where the pretty printer Python module is
++NIM_SYSROOT=$(dirname $(dirname $($READLINK -e $(which nim))))
++GDB_PYTHON_MODULE_PATH="$NIM_SYSROOT/tools/nim-gdb.py"
++
++# Run GDB with the additional arguments that load the pretty printers
++# Set the environment variable `NIM_GDB` to overwrite the call to a
++# different/specific command (defaults to `gdb`).
++NIM_GDB="${NIM_GDB:-gdb}"
++# exec replaces the new process of bash with gdb. It is always good to
++# have fewer processes.
++exec "${NIM_GDB}" -eval-command="source $GDB_PYTHON_MODULE_PATH" "$@"