From e3aa9769b9b40e692deea2ba32013e96b05aa61f Mon Sep 17 00:00:00 2001 From: hellium6 <88252053+hellium6@users.noreply.github.com> Date: Fri, 5 Sep 2025 03:54:18 +0000 Subject: [PATCH] Update lang/nim to 2.0.16 --- lang/nim/Makefile | 17 +++++++++++++++-- lang/nim/PLIST | 6 +++++- lang/nim/buildlink3.mk | 4 ++-- lang/nim/distinfo | 12 ++++++------ 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/lang/nim/Makefile b/lang/nim/Makefile index 62516bf8ac6a..d4471d74bb22 100644 --- a/lang/nim/Makefile +++ b/lang/nim/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.37 2024/05/16 09:59:20 pho Exp $ -DISTNAME= nim-2.0.4 +DISTNAME= nim-2.0.16 CATEGORIES= lang MASTER_SITES= http://nim-lang.org/download/ EXTRACT_SUFX= .tar.xz @@ -13,7 +13,7 @@ LICENSE= mit # C2VERSION_TAG= 86742fb02c6606ab01a532a0085784effb2e753e # NIMBLE_TAG= 168416290e49023894fc26106799d6f1fc964a2d # CHECKSUMS_TAG= b4c73320253f78e3a265aec6d9e8feb83f97c77b -ATLAS_TAG= 7b780811a168f3f32bff4822369dda46a7f87f9a +ATLAS_TAG= 60681b93af4c8914afbd8eae9fc9820ba4d198a0 GH_SFX= .tar.gz @@ -87,6 +87,19 @@ post-extract: #mkdir -p $build_wrksrc/dist/nimble/dist #cp -r $build_wrksrc/dist/checksums $build_wrksrc/dist/nimble/dist/checksums ${MV} ${WRKSRC}/dist/atlas-${ATLAS_TAG} ${WRKSRC}/dist/atlas + # atlas also needs sat, so it wants to git clone it. pkgsrc doesn't + # allow that. We use cp instead of ln for DirExists in cloneDependency + # proc on tools/deps.nim + ${MKDIR} ${WRKSRC}/dist/atlas/dist + ${CP} -r ${WRKSRC}/dist/nimble/vendor/sat ${WRKSRC}/dist/atlas/dist/sat + +post-patch: + # To fix a git hash related error + ${SED} -i'.orig' -e '/git_revision_override\*/ s,"","-",' \ + ${WRKSRC}/dist/nimble/src/nimblepkg/options.nim + # Allow to compile on NetBSD + ${SED} -i'.orig' -e '/"freebsd"/ s,$$,\n elif defined(netbsd):\n "netbsd",' \ + ${WRKSRC}/dist/nimble/src/nimblepkg/downloadnim.nim # nim doesn't honor the environment variable LDFLAGS. In order to # support PKGSRC_USE_RELRO, we need to translate the flags to compiler diff --git a/lang/nim/PLIST b/lang/nim/PLIST index 7be27d4d17a7..9dd9490b5027 100644 --- a/lang/nim/PLIST +++ b/lang/nim/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2024/04/22 13:23:55 nikita Exp $ +@comment $NetBSD$ bin/nim bin/nim-gdb bin/nim_dbg @@ -7,6 +7,7 @@ bin/niminst bin/nimpretty bin/nimsuggest bin/testament +lib/nim/nimpretty/nimpretty lib/nim/nimpretty/nimpretty.nim lib/nim/nimpretty/nimpretty.nim.cfg lib/nim/nimpretty/tester.nim @@ -26,6 +27,7 @@ lib/nim/nimpretty/tests/tevil_spaces.nim lib/nim/nimpretty/tests/wrong_ind.nim lib/nim/nimsuggest/config.nims lib/nim/nimsuggest/crashtester.nim +lib/nim/nimsuggest/nimsuggest lib/nim/nimsuggest/nimsuggest.nim lib/nim/nimsuggest/nimsuggest.nim.cfg lib/nim/nimsuggest/nimsuggest.nimble @@ -46,6 +48,7 @@ lib/nim/nimsuggest/tests/t20265_2.nim lib/nim/nimsuggest/tests/t20440.nim lib/nim/nimsuggest/tests/t20440.nims lib/nim/nimsuggest/tests/t21185.nim +lib/nim/nimsuggest/tests/t22448.nim lib/nim/nimsuggest/tests/taccent_highlight.nim lib/nim/nimsuggest/tests/tcallstrlit_highlight.nim lib/nim/nimsuggest/tests/tcase.nim @@ -66,6 +69,7 @@ lib/nim/nimsuggest/tests/tdot3.nim lib/nim/nimsuggest/tests/tdot4.nim lib/nim/nimsuggest/tests/tfatal1.nim lib/nim/nimsuggest/tests/tgeneric_highlight.nim +lib/nim/nimsuggest/tests/timport_highlight.nim lib/nim/nimsuggest/tests/tinclude.nim lib/nim/nimsuggest/tests/tmacro_highlight.nim lib/nim/nimsuggest/tests/tno_deref.nim diff --git a/lang/nim/buildlink3.mk b/lang/nim/buildlink3.mk index acd5b9ef807f..47f1c4395fc9 100644 --- a/lang/nim/buildlink3.mk +++ b/lang/nim/buildlink3.mk @@ -5,8 +5,8 @@ BUILDLINK_TREE+= nim .if !defined(NIM_BUILDLINK3_MK) NIM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.nim+= nim>=2.0.4 -BUILDLINK_ABI_DEPENDS.nim+= nim>=2.0.4 +BUILDLINK_API_DEPENDS.nim+= nim>=2.0.16 +BUILDLINK_ABI_DEPENDS.nim+= nim>=2.0.16 BUILDLINK_PKGSRCDIR.nim?= ../../lang/nim .endif # NIM_BUILDLINK3_MK diff --git a/lang/nim/distinfo b/lang/nim/distinfo index 2b89b8faaf61..17ccd493930a 100644 --- a/lang/nim/distinfo +++ b/lang/nim/distinfo @@ -1,12 +1,12 @@ $NetBSD: distinfo,v 1.30 2024/05/16 09:59:20 pho Exp $ -BLAKE2s (atlas-7b780811a168f3f32bff4822369dda46a7f87f9a.tar.gz) = 88f21b8c524da0db89f53d3233040be6a9a021157e04d6d24f5516fdc03421ef -SHA512 (atlas-7b780811a168f3f32bff4822369dda46a7f87f9a.tar.gz) = 392c4149ceec9918ff0277afd02d89cb13ce98c326744119b9bc9fe439e187cdb9230c3b300a6a48f93b0b2378ffc10e1a3a6990df31f4d36dd392dd7aa83797 -Size (atlas-7b780811a168f3f32bff4822369dda46a7f87f9a.tar.gz) = 49221 bytes +BLAKE2s (atlas-60681b93af4c8914afbd8eae9fc9820ba4d198a0.tar.gz) = cfcee1b1000884d6e40332b7f23ba62044954730269b6f7b9325ef60ffc3363f +SHA512 (atlas-60681b93af4c8914afbd8eae9fc9820ba4d198a0.tar.gz) = dd23657cf7b70dcc28e1eda44597a57b2aa91e4ee995601f66e6b266ee4838a551f7116a98907de071147824c1b647257eefc4e4fd6b5d40a9553fb2adbf9443 +Size (atlas-60681b93af4c8914afbd8eae9fc9820ba4d198a0.tar.gz) = 59082 bytes +BLAKE2s (nim-2.0.16.tar.xz) = 8c11ce72f8f58653dac1ba65dc459ed1173362f854e1cde7be739c6adac08bb4 +SHA512 (nim-2.0.16.tar.xz) = cc587cc4a02630f79017b09360b042c7d4a94d716ca5d5afd2f6528983e7ab075a3a1a336bf55c51e4306c46e666fdbd0b8ea512ce36d85ef0c34b7c5749945a +Size (nim-2.0.16.tar.xz) = 7659928 bytes BLAKE2s (nim-2.0.4+netbsd-aarch64.tar.xz) = 51931047f5ed0d2268f0029338b4dc7220a6b10b906bdde904b4f67fbbe7470f SHA512 (nim-2.0.4+netbsd-aarch64.tar.xz) = 914c370dccda9e9a06d02e7fc29473b7d0cfcdfde8de41ddaddd149ea17700168314b0eaea0cef79c4e3472346832f279a18f5225e7b12206e47f48155d01bbd Size (nim-2.0.4+netbsd-aarch64.tar.xz) = 3393348 bytes -BLAKE2s (nim-2.0.4.tar.xz) = e81586f329ba76f4891c68dc2c5d352c812fc66223c869278d44a5d3f17bf0da -SHA512 (nim-2.0.4.tar.xz) = 1918b3d4a4fc02714677b2ca5051dc69e1d1daead2cf4dcc9b997076540d07d58ee4fe3049de86a37faa3143de1d3b95bedfa31f31d8463987bb267107459793 -Size (nim-2.0.4.tar.xz) = 7620508 bytes SHA1 (patch-bin_nim-gdb) = 0d4e9ae4cc8687ca7821891b63808fa1d175069c