Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Jul 2024 23:00:22 GMT
From:      Torsten Zuehlsdorff <tz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: fa8e9699083d - main - lang/nim: Upgrade from 2.0.6 to 2.0.8
Message-ID:  <202407062300.466N0MM9058251@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fa8e9699083daf7ad57e14366ddc3039258d07e6

commit fa8e9699083daf7ad57e14366ddc3039258d07e6
Author:     Torsten Zuehlsdorff <tz@FreeBSD.org>
AuthorDate: 2024-07-06 22:43:09 +0000
Commit:     Torsten Zuehlsdorff <tz@FreeBSD.org>
CommitDate: 2024-07-06 23:00:10 +0000

    lang/nim: Upgrade from 2.0.6 to 2.0.8
    
      Major improvements in this release:
    
        Nim’s allocator is now much more stable with --threads:on.
        Better support for gcc14.
        Optimized setLen(0) for uninitialized strings and seqs.
        Optimized move when used with --mm:refc.
    
      These reported issues were fixed:
    
        Fixed “[Semi-regression] C code contains backtick`gensym” (#23711)
        Fixed “setLen(0) allocates memory causing performance regression” (#23742)
        Fixed “Sigsegv on std/tasks destructor” (#23725)
        Fixed “genericAssign does not take care of the importC variables” (#9940)
        Fixed “move(table) does not move the table” (#23759)
        Fixed “Local variables can be prematurely moved to closure, causing use-after-move” (#23748)
        Fixed “tvatiteropenarray test fails with c++” (#19977)
    
      Taken from:
        https://nim-lang.org/blog/2024/07/03/version-208-released.html
    
      Full Changelog:
        https://github.com/nim-lang/Nim/compare/v2.0.6...v2.0.8
    
    PR:             280142
    Approved by:    Neal Nelson (maintainer)
---
 lang/nim/Makefile             |  2 +-
 lang/nim/distinfo             |  6 +++---
 lang/nim/files/patch-koch.nim | 37 +++++++++++++++++++++++++++----------
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/lang/nim/Makefile b/lang/nim/Makefile
index 1fe4a63d97ee..0828cd466973 100644
--- a/lang/nim/Makefile
+++ b/lang/nim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nim
-DISTVERSION=	2.0.6
+DISTVERSION=	2.0.8
 CATEGORIES=	lang
 MASTER_SITES=	https://nim-lang.org/download/
 
diff --git a/lang/nim/distinfo b/lang/nim/distinfo
index 3db7bb31f01d..12f932e3244d 100644
--- a/lang/nim/distinfo
+++ b/lang/nim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718761713
-SHA256 (nim-2.0.6.tar.xz) = fbcd5d731743adec2b3bb9bcf6f5fd993ed11b250f957166bebf328f307cba6a
-SIZE (nim-2.0.6.tar.xz) = 7668088
+TIMESTAMP = 1720184077
+SHA256 (nim-2.0.8.tar.xz) = 5702da844700d3129db73170b5c606adbdfb87e82b816c0d91107ea20a65df16
+SIZE (nim-2.0.8.tar.xz) = 7617556
diff --git a/lang/nim/files/patch-koch.nim b/lang/nim/files/patch-koch.nim
index bf06daa94b6d..ed81b385ee4a 100644
--- a/lang/nim/files/patch-koch.nim
+++ b/lang/nim/files/patch-koch.nim
@@ -1,6 +1,19 @@
---- koch.nim.orig	2024-06-18 13:26:19 UTC
+--- koch.nim.orig	2024-07-05 12:55:45 UTC
 +++ koch.nim
-@@ -146,30 +146,30 @@ proc csource(args: string) =
+@@ -11,9 +11,9 @@ const
+ 
+ const
+   # examples of possible values for repos: Head, ea82b54
+-  NimbleStableCommit = "be2f1309b35a6189ff5eb34a007793e6d3f94157" # master
+-  AtlasStableCommit = "5faec3e9a33afe99a7d22377dd1b45a5391f5504"
+-  ChecksumsStableCommit = "025bcca3915a1b9f19878cea12ad68f9884648fc"
++  NimbleStableCommit = "f8bd7b5fa6ea7a583b411b5959b06e6b5eb23667" # master
++  AtlasStableCommit = "7b780811a168f3f32bff4822369dda46a7f87f9a"
++  ChecksumsStableCommit = "b4c73320253f78e3a265aec6d9e8feb83f97c77b"
+   SatStableCommit = "faf1617f44d7632ee9601ebc13887644925dcc01"
+ 
+   # examples of possible values for fusion: #head, #ea82b54, 1.2.3
+@@ -146,32 +146,32 @@ proc csource(args: string) =
             "--main:compiler/nim.nim compiler/installer.ini $1") %
         [args, VersionAsString, compileNimInst])
  
@@ -40,20 +53,24 @@
 -  let commit = if latest: "HEAD" else: AtlasStableCommit
 -  cloneDependency(distDir, "https://github.com/nim-lang/atlas.git",
 -                  commit = commit, allowBundled = true)
+-  cloneDependency(distDir / "atlas" / distDir, "https://github.com/nim-lang/sat.git",
+-                commit = SatStableCommit, allowBundled = true)
 -  # installer.ini expects it under $nim/bin
 -  nimCompile("dist/atlas/src/atlas.nim",
--             options = "-d:release --noNimblePath " & args)
+-             options = "-d:release --noNimblePath -d:nimAtlasBootstrap " & 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)
++#  cloneDependency(distDir / "atlas" / distDir, "https://github.com/nim-lang/sat.git",
++#                commit = SatStableCommit, allowBundled = true)
 +#  # installer.ini expects it under $nim/bin
 +#  nimCompile("dist/atlas/src/atlas.nim",
-+#             options = "-d:release --noNimblePath " & args)
++#             options = "-d:release --noNimblePath -d:nimAtlasBootstrap " & args)
  
  proc bundleNimsuggest(args: string) =
    nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",
-@@ -206,8 +206,8 @@ proc zip(latest: bool; args: string) =
+@@ -208,8 +208,8 @@ proc zip(latest: bool; args: string) =
  
  proc zip(latest: bool; args: string) =
    bundleChecksums(latest)
@@ -64,7 +81,7 @@
    bundleNimsuggest(args)
    bundleNimpretty(args)
    bundleWinTools(args)
-@@ -216,15 +216,15 @@ proc zip(latest: bool; args: string) =
+@@ -218,15 +218,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])
  
@@ -87,7 +104,7 @@
    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" %
-@@ -260,8 +260,8 @@ proc nsis(latest: bool; args: string) =
+@@ -262,8 +262,8 @@ proc nsis(latest: bool; args: string) =
  
  proc nsis(latest: bool; args: string) =
    bundleChecksums(latest)
@@ -98,7 +115,7 @@
    bundleNimsuggest(args)
    bundleWinTools(args)
    # make sure we have generated the niminst executables:
-@@ -524,43 +524,43 @@ proc icTest(args: string) =
+@@ -526,43 +526,43 @@ proc icTest(args: string) =
      exec(cmd)
      inc i
  
@@ -173,7 +190,7 @@
  
  proc runCI(cmd: string) =
    doAssert cmd.len == 0, cmd # avoid silently ignoring
-@@ -682,18 +682,18 @@ proc showHelp(success: bool) =
+@@ -684,18 +684,18 @@ proc showHelp(success: bool) =
    quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)),
                     CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure)
  
@@ -199,7 +216,7 @@
      localDocsOut = ""
      skipIntegrityCheck = false
    while true:
-@@ -729,34 +729,34 @@ when isMainModule:
+@@ -731,34 +731,34 @@ when isMainModule:
        of "distrohelper": geninstall()
        of "install": install(op.cmdLineRest)
        of "testinstall": testUnixInstall(op.cmdLineRest)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407062300.466N0MM9058251>