Re: [PR PATCH] [Updated] Nim: update to v2.0.0, adopt

[adigitoleo <adigitoleo@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 965 bytes --]

There is an updated pull request by adigitoleo against master on the void-packages repository

https://github.com/adigitoleo/void-packages nim-v2
https://github.com/void-linux/void-packages/pull/45597

Nim: update to v2.0.0, adopt
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64 glibc)
- I built this PR locally for these architectures:
  - aarch64
  - armv6l
  - x86_64-musl

#### Notes

Other than version bumps, the only change is adding `git` as hostmakedepends. The new version of `kock` (Nim build script) clones some extra dependencies for bootstrapping the Nim `libffi`. See <https://github.com/nim-lang/Nim/commit/14bc3f32683c87f971bf23ae30d500dc89cdebb8>.

I'm not sure if I should find a way to patch/disable it instead, or if that is OK.


A patch file from https://github.com/void-linux/void-packages/pull/45597.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nim-v2-45597.patch --]
[-- Type: text/x-diff, Size: 3316 bytes --]

From 631405130fb2a14982df0eda9a631b4ffbc188be Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@posteo.net>
Date: Mon, 14 Aug 2023 13:34:46 +1000
Subject: [PATCH 1/2] Nim: update to v2.0.0, adopt

---
 srcpkgs/nim/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index 175dcbaea8439..ee04540015153 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,24 +1,25 @@
 # Template file for 'nim'
 pkgname=nim
-version=1.6.14
+version=2.0.0
 revision=1
-_c1version=561b417c65791cd8356b5f73620914ceff845d10
-_nimbleversion=0.13.1
+_c2version=86742fb02c6606ab01a532a0085784effb2e753e
+_nimbleversion=0.14.2
 build_wrksrc="Nim-$version"
 depends="gcc openssl-devel"
+hostmakedepends="git"
 short_desc="Nim programming language"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leon (adigitoleo) <adigitoleo@posteo.net>"
 license="MIT"
 homepage="https://nim-lang.org/"
 distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz
- https://github.com/nim-lang/csources_v1/archive/${_c1version}.tar.gz>csources_v1-${_c1version}.tar.gz
+ https://github.com/nim-lang/csources_v2/archive/${_c2version}.tar.gz>csources_v2-${_c2version}.tar.gz
  https://github.com/nim-lang/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
-checksum="0a31586a6194545be2cfb159189d0f39c8ced2ec134119f3d517dcada9b4aeea
- 71c823444c794a12da9027d19d6a717dd7759521ecbbe28190b08372142607ec
- e6aa8d9ee4b3ed0321dca329b4a38fa546771b9729984482fb50fe73d3777f5d"
+checksum="2d33e3a75fe6d26726de432eb236657b3eadef5727e9c08101a91e06cb0c2dc5
+	9c2be306011e0c953bd63a565a4bd6a094e22d3944ca201977c1d03560d0a25c
+	d94f11c592d49aed6c5a492289f187010eb8c103b2b653252763d2f65a82abac"
 
 post_extract() {
-	mv csources_v1-$_c1version $build_wrksrc/csources_v1
+	mv csources_v2-$_c2version $build_wrksrc/csources_v2
 	mkdir $build_wrksrc/dist
 	mv nimble-$_nimbleversion $build_wrksrc/dist/nimble
 }
@@ -27,13 +28,13 @@ do_build() {
 	case "$XBPS_TARGET_MACHINE" in
 		i686*)
 			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
-			make -C csources_v1 ucpu=i686 ${makejobs};;
+			make -C csources_v2 ucpu=i686 ${makejobs};;
 		ppc|ppc-musl)
 			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
-			make -C csources_v1 ucpu=powerpc ${makejobs};;
+			make -C csources_v2 ucpu=powerpc ${makejobs};;
 		*)
 			CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
-			make -C csources_v1 ${makejobs};;
+			make -C csources_v2 ${makejobs};;
 	esac
 
 	bin/nim c koch

From dd1ee7c25281d91809e2c25840f51ae86f93bee7 Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@posteo.net>
Date: Mon, 14 Aug 2023 14:00:47 +1000
Subject: [PATCH 2/2] fix: Place depends= after hostmakedepends=

---
 srcpkgs/nim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index ee04540015153..0f19e0d9971f2 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -5,8 +5,8 @@ revision=1
 _c2version=86742fb02c6606ab01a532a0085784effb2e753e
 _nimbleversion=0.14.2
 build_wrksrc="Nim-$version"
-depends="gcc openssl-devel"
 hostmakedepends="git"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="Leon (adigitoleo) <adigitoleo@posteo.net>"
 license="MIT"