Friday, April 28, 2023

[update] lang/nim to 1.6.12

diff refs/heads/master refs/heads/nim
commit - f98d98aa4b9d286485e551848ef512575e831563
commit + 49ee955f0f53d412e2de56e548d7bb84867acb5a
blob - b56f30fdf7af48cd8316df88df8f5adfe2f93af0
blob + 62353bfe8ea8bc8fab8208fe41bf34edfdac30d2
--- lang/nim/Makefile
+++ lang/nim/Makefile
@@ -2,8 +2,7 @@ DISTNAME = nim-1.6.6

COMMENT = statically typed systems programming language

-DISTNAME = nim-1.6.6
-REVISION = 2
+DISTNAME = nim-1.6.12
EXTRACT_SUFX = .tar.xz

CATEGORIES = lang
blob - df3d38b4ba4a9c1af946d8ff3bdbadb90d28df30
blob + 9a0c03856564f431cd4e63a2a0979c6d93e46bd6
--- lang/nim/distinfo
+++ lang/nim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nim-1.6.6.tar.xz) = Z7ERzm84YVA7n8wcrln8NNASJWbT7P7zoGSiF0EhpFI=
-SIZE (nim-1.6.6.tar.xz) = 5149956
+SHA256 (nim-1.6.12.tar.xz) = rO8LCrdzYE1Nc5S2hRntt0+zD0aRIpSyi8J+DHtLTcI=
+SIZE (nim-1.6.12.tar.xz) = 5180496
blob - 57fe34326f99e29894db91c6e92c1b6c632103c0
blob + 1e8c9e3682a6d7a6c44be060dd41b25f5fc5f1d1
--- lang/nim/patches/patch-config_nim_cfg
+++ lang/nim/patches/patch-config_nim_cfg
@@ -24,7 +24,7 @@ Index: config/nim.cfg
@elif haiku:
gcc.options.linker = "-Wl,--as-needed -lnetwork"
gcc.cpp.options.linker = "-Wl,--as-needed -lnetwork"
-@@ -195,21 +195,27 @@ clang.objc.options.linker = "-lobjc -lgnustep-base"
+@@ -198,21 +198,27 @@ clang.objc.options.linker = "-lobjc -lgnustep-base"

# Options for FreeBSD, OpenBSD, NetBSD linker to add locations for searching
# shared libraries.
@@ -58,7 +58,7 @@ Index: config/nim.cfg
@elif netbsd:
cincludes: "/usr/pkg/include"
clibdir: "/usr/pkg/lib"
-@@ -229,15 +235,15 @@ clang.objc.options.linker = "-lobjc -lgnustep-base"
+@@ -232,15 +238,15 @@ 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

@@ -78,7 +78,7 @@ Index: config/nim.cfg
gcc.cpp.options.debug = "-g3 -Og"
#passl = "-pg"

-@@ -251,8 +257,8 @@ llvm_gcc.options.size = "-Os"
+@@ -254,8 +260,8 @@ llvm_gcc.options.size = "-Os"
clang.options.debug = "-g"
clang.cpp.options.debug = "-g"
clang.options.always = "-w -ferror-limit=3"
blob - /dev/null
blob + fec523e021a5f7744ae2eaf048b26e469ac391cd (mode 644)
--- /dev/null
+++ lang/nim/patches/patch-lib_pure_asyncnet_nim
@@ -0,0 +1,22 @@
+Index: lib/pure/asyncnet.nim
+--- lib/pure/asyncnet.nim.orig
++++ lib/pure/asyncnet.nim
+@@ -261,6 +261,9 @@ when defineSsl:
+ ErrClearError()
+ # Call the desired operation.
+ opResult = op
++ var err = SSL_ERROR_NONE
++ if opResult < 0:
++ err = getSslError(socket, opResult.cint)
+
+ # Send any remaining pending SSL data.
+ await sendPendingSslData(socket, flags)
+@@ -268,7 +271,7 @@ when defineSsl:
+ # If the operation failed, try to see if SSL has some data to read
+ # or write.
+ if opResult < 0:
+- let err = getSslError(socket, opResult.cint)
++ #let err = getSslError(socket, opResult.cint)
+ let fut = appeaseSsl(socket, flags, err.cint)
+ yield fut
+ if not fut.read():
blob - d91cfcb6d0dbe73456204a82465f09f4b376ab4d
blob + 8a0667102d5e2d97b19a568f14343cdd52c9cb77
--- lang/nim/pkg/PLIST
+++ lang/nim/pkg/PLIST
@@ -12,6 +12,7 @@ lib/nim/core/
lib/nim/arch/x86/
lib/nim/arch/x86/amd64.S
lib/nim/arch/x86/i386.S
+lib/nim/compilation.nim
lib/nim/core/
lib/nim/core/hotcodereloading.nim
lib/nim/core/locks.nim
Hello,

Here's an update for nim to 1.6.12. I have not extensively tested this except
for compiling/running nitter (https://github.com/zedeus/nitter). nitter itself
has been running fine since at least 1.6.8. The patch with this diff is
related to https://github.com/nim-lang/Nim/issues/20144.

Other comments/feedback?

Thanks,
Lucas

No comments:

Post a Comment