* [PR PATCH] Update Nim packages
@ 2023-09-22 17:25 HiPhish
2023-09-22 17:27 ` HiPhish
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: HiPhish @ 2023-09-22 17:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
There is a new pull request by HiPhish against master on the void-packages repository
https://github.com/HiPhish/void-packages nim
https://github.com/void-linux/void-packages/pull/46187
Update Nim packages
#### 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
A patch file from https://github.com/void-linux/void-packages/pull/46187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nim-46187.patch --]
[-- Type: text/x-diff, Size: 6690 bytes --]
From 8321c378c24c1746452d09c05272513ac0d78de0 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Fri, 22 Sep 2023 15:40:33 +0200
Subject: [PATCH 1/2] choosenim: update to 0.8.4
---
.../choosenim/patches/system-libarchive.patch | 103 ------------------
srcpkgs/choosenim/template | 6 +-
2 files changed, 3 insertions(+), 106 deletions(-)
delete mode 100644 srcpkgs/choosenim/patches/system-libarchive.patch
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
deleted file mode 100644
index a4cab336e99d4..0000000000000
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git choosenim.nimble choosenim.nimble
-index 7ba9b36..dc47faa 100644
---- a/choosenim.nimble
-+++ b/choosenim.nimble
-@@ -14,7 +14,7 @@ skipExt = @["nim"]
- # Dependencies
-
- requires "nim >= 1.2.6", "nimble#8f7af86"
--requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "nimterop >= 0.6.12"
- #requires "libcurl >= 1.0.0" - OSX now uses httpclient
- requires "analytics >= 0.2.0"
- requires "osinfo >= 0.3.0"
-diff --git nimarchive/nimarchive/archive.nim nimarchive/nimarchive/archive.nim
-index 1d45140..d5361e0 100644
---- a/nimarchive/nimarchive/archive.nim
-+++ b/nimarchive/nimarchive/archive.nim
-@@ -2,28 +2,6 @@ import os, strutils
-
- import nimterop/[build, cimport]
-
--const
-- baseDir = getProjectCacheDir("nimarchive" / "libarchive")
--
-- defs = """
-- archiveStatic
-- archiveJBB
-- archiveSetVer=3.4.3
--
-- iconvStatic
-- iconvStd
-- iconvJBB
-- iconvSetVer=1.16.0
-- """
--
--setDefines(defs.splitLines())
--
--getHeader(
-- header = "archive.h",
-- outdir = baseDir,
-- jbburi = "LibArchive",
-- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=LibArchive-v$1/ skip=libiconv"
--)
-
- import iconv
-
-@@ -52,9 +30,7 @@ static:
- cSkipSymbol(@["archive_read_open_file", "archive_write_open_file"])
-
- let
-- archiveEntryPath {.compileTime.} = archivePath[0 .. ^3] & "_entry.h"
-+ archivePath {.compileTime.} = "archive.h"
-+ archiveEntryPath {.compileTime.} = "archive_entry.h"
-
--when archiveStatic:
-- cImport(@[archivePath, archiveEntryPath], recurse = true)
--else:
-- cImport(@[archivePath, archiveEntryPath], recurse = true, dynlib = archiveLPath)
-+cImport(@[archivePath, archiveEntryPath], recurse = false)
-diff --git nimarchive/nimarchive/iconv.nim nimarchive/nimarchive/iconv.nim
-index d983398..4f61a5b 100644
---- a/nimarchive/nimarchive/iconv.nim
-+++ b/nimarchive/nimarchive/iconv.nim
-@@ -2,15 +2,3 @@ import os, strutils
-
- import nimterop/build
-
--const
-- baseDir = getProjectCacheDir("nimarchive" / "iconv")
--
--getHeader(
-- header = "iconv.h",
-- dlurl = "https://ftp.gnu.org/gnu/libiconv/libiconv-$1.tar.gz",
-- conanuri = "libiconv",
-- jbburi = "Libiconv",
-- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=Libiconv-v$1/",
-- outdir = baseDir,
-- conFlags = "--enable-static=yes --with-pic=yes"
--)
-diff --git src/choosenimpkg/ssl.nim src/choosenimpkg/ssl.nim
-index f20b246..7576066 100644
---- a/src/choosenimpkg/ssl.nim
-+++ b/src/choosenimpkg/ssl.nim
-@@ -2,19 +2,3 @@ import strutils
-
- import nimterop/[build, cimport]
-
--# Download openssl from JuliaBinaryWrappers
--setDefines(@[
-- "cryptoJBB", "cryptoStatic"
--])
--
--getHeader(
-- "crypto.h",
-- jbburi = "openssl",
-- outdir = getProjectCacheDir("nimopenssl")
--)
--
--const
-- sslLPath = cryptoLPath.replace("crypto", "ssl")
--
--# Link static binaries
--{.passL: sslLPath & " " & cryptoLPath.}
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index 064dbbbdf4d52..47225018d1c4a 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,7 +1,7 @@
# Template file for 'choosenim'
pkgname=choosenim
-version=0.7.4
-revision=3
+version=0.8.4
+revision=1
create_wrksrc=yes
hostmakedepends="git nim openssl-devel pkg-config"
makedepends="openssl-devel zlib-devel libarchive-devel"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/dom96/choosenim"
distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
-checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
+checksum="c849fb531a3b19d362288a59cc78044221b01cb752e0f5f40810707e6377b09c
c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
case "$XBPS_TARGET_MACHINE" in
From c13ef5fb657bd5874d45c7e28d103bf40852d792 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Fri, 22 Sep 2023 19:22:42 +0200
Subject: [PATCH 2/2] nim: update to 2.0.0
---
srcpkgs/nim/template | 33 ++++++---------------------------
1 file changed, 6 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index 175dcbaea8439..1741e302b72fd 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,41 +1,20 @@
# Template file for 'nim'
pkgname=nim
-version=1.6.14
+version=2.0.0
revision=1
_c1version=561b417c65791cd8356b5f73620914ceff845d10
-_nimbleversion=0.13.1
-build_wrksrc="Nim-$version"
+_nimbleversion=0.14.2
depends="gcc openssl-devel"
+hostmakedepends="git"
short_desc="Nim programming language"
maintainer="Orphaned <orphan@voidlinux.org>"
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/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
-checksum="0a31586a6194545be2cfb159189d0f39c8ced2ec134119f3d517dcada9b4aeea
- 71c823444c794a12da9027d19d6a717dd7759521ecbbe28190b08372142607ec
- e6aa8d9ee4b3ed0321dca329b4a38fa546771b9729984482fb50fe73d3777f5d"
-
-post_extract() {
- mv csources_v1-$_c1version $build_wrksrc/csources_v1
- mkdir $build_wrksrc/dist
- mv nimble-$_nimbleversion $build_wrksrc/dist/nimble
-}
+distfiles="https://nim-lang.org/download/nim-${version}.tar.xz"
+checksum="bd6101d840036fb78e93a69df6cf3f9fd0c21cd754b695ff84a3b4add8ed0af7"
do_build() {
- case "$XBPS_TARGET_MACHINE" in
- i686*)
- CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ucpu=i686 ${makejobs};;
- ppc|ppc-musl)
- CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ucpu=powerpc ${makejobs};;
- *)
- CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ${makejobs};;
- esac
-
+ sh build.sh
bin/nim c koch
./koch boot -d:release -d:danger
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Update Nim packages
2023-09-22 17:25 [PR PATCH] Update Nim packages HiPhish
@ 2023-09-22 17:27 ` HiPhish
2023-09-22 17:28 ` [PR PATCH] [Updated] " HiPhish
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: HiPhish @ 2023-09-22 17:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
New comment by HiPhish on void-packages repository
https://github.com/void-linux/void-packages/pull/46187#issuecomment-1731785871
Comment:
Updating choosenim fixed https://github.com/void-linux/void-packages/issues/46168. And while I was at it I also updated the Nim package itself. According to the Nim creator 2.0 is backwards compatible with at the source code level 1.x, so it should be fine to update the existing package instead of creating a new `nim2` package.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Update Nim packages
2023-09-22 17:25 [PR PATCH] Update Nim packages HiPhish
2023-09-22 17:27 ` HiPhish
@ 2023-09-22 17:28 ` HiPhish
2023-09-22 20:33 ` HiPhish
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: HiPhish @ 2023-09-22 17:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
There is an updated pull request by HiPhish against master on the void-packages repository
https://github.com/HiPhish/void-packages nim
https://github.com/void-linux/void-packages/pull/46187
Update Nim packages
#### 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
A patch file from https://github.com/void-linux/void-packages/pull/46187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nim-46187.patch --]
[-- Type: text/x-diff, Size: 6690 bytes --]
From 8321c378c24c1746452d09c05272513ac0d78de0 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Fri, 22 Sep 2023 15:40:33 +0200
Subject: [PATCH 1/2] choosenim: update to 0.8.4
---
.../choosenim/patches/system-libarchive.patch | 103 ------------------
srcpkgs/choosenim/template | 6 +-
2 files changed, 3 insertions(+), 106 deletions(-)
delete mode 100644 srcpkgs/choosenim/patches/system-libarchive.patch
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
deleted file mode 100644
index a4cab336e99d4..0000000000000
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git choosenim.nimble choosenim.nimble
-index 7ba9b36..dc47faa 100644
---- a/choosenim.nimble
-+++ b/choosenim.nimble
-@@ -14,7 +14,7 @@ skipExt = @["nim"]
- # Dependencies
-
- requires "nim >= 1.2.6", "nimble#8f7af86"
--requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "nimterop >= 0.6.12"
- #requires "libcurl >= 1.0.0" - OSX now uses httpclient
- requires "analytics >= 0.2.0"
- requires "osinfo >= 0.3.0"
-diff --git nimarchive/nimarchive/archive.nim nimarchive/nimarchive/archive.nim
-index 1d45140..d5361e0 100644
---- a/nimarchive/nimarchive/archive.nim
-+++ b/nimarchive/nimarchive/archive.nim
-@@ -2,28 +2,6 @@ import os, strutils
-
- import nimterop/[build, cimport]
-
--const
-- baseDir = getProjectCacheDir("nimarchive" / "libarchive")
--
-- defs = """
-- archiveStatic
-- archiveJBB
-- archiveSetVer=3.4.3
--
-- iconvStatic
-- iconvStd
-- iconvJBB
-- iconvSetVer=1.16.0
-- """
--
--setDefines(defs.splitLines())
--
--getHeader(
-- header = "archive.h",
-- outdir = baseDir,
-- jbburi = "LibArchive",
-- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=LibArchive-v$1/ skip=libiconv"
--)
-
- import iconv
-
-@@ -52,9 +30,7 @@ static:
- cSkipSymbol(@["archive_read_open_file", "archive_write_open_file"])
-
- let
-- archiveEntryPath {.compileTime.} = archivePath[0 .. ^3] & "_entry.h"
-+ archivePath {.compileTime.} = "archive.h"
-+ archiveEntryPath {.compileTime.} = "archive_entry.h"
-
--when archiveStatic:
-- cImport(@[archivePath, archiveEntryPath], recurse = true)
--else:
-- cImport(@[archivePath, archiveEntryPath], recurse = true, dynlib = archiveLPath)
-+cImport(@[archivePath, archiveEntryPath], recurse = false)
-diff --git nimarchive/nimarchive/iconv.nim nimarchive/nimarchive/iconv.nim
-index d983398..4f61a5b 100644
---- a/nimarchive/nimarchive/iconv.nim
-+++ b/nimarchive/nimarchive/iconv.nim
-@@ -2,15 +2,3 @@ import os, strutils
-
- import nimterop/build
-
--const
-- baseDir = getProjectCacheDir("nimarchive" / "iconv")
--
--getHeader(
-- header = "iconv.h",
-- dlurl = "https://ftp.gnu.org/gnu/libiconv/libiconv-$1.tar.gz",
-- conanuri = "libiconv",
-- jbburi = "Libiconv",
-- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=Libiconv-v$1/",
-- outdir = baseDir,
-- conFlags = "--enable-static=yes --with-pic=yes"
--)
-diff --git src/choosenimpkg/ssl.nim src/choosenimpkg/ssl.nim
-index f20b246..7576066 100644
---- a/src/choosenimpkg/ssl.nim
-+++ b/src/choosenimpkg/ssl.nim
-@@ -2,19 +2,3 @@ import strutils
-
- import nimterop/[build, cimport]
-
--# Download openssl from JuliaBinaryWrappers
--setDefines(@[
-- "cryptoJBB", "cryptoStatic"
--])
--
--getHeader(
-- "crypto.h",
-- jbburi = "openssl",
-- outdir = getProjectCacheDir("nimopenssl")
--)
--
--const
-- sslLPath = cryptoLPath.replace("crypto", "ssl")
--
--# Link static binaries
--{.passL: sslLPath & " " & cryptoLPath.}
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index 064dbbbdf4d52..47225018d1c4a 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,7 +1,7 @@
# Template file for 'choosenim'
pkgname=choosenim
-version=0.7.4
-revision=3
+version=0.8.4
+revision=1
create_wrksrc=yes
hostmakedepends="git nim openssl-devel pkg-config"
makedepends="openssl-devel zlib-devel libarchive-devel"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/dom96/choosenim"
distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
-checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
+checksum="c849fb531a3b19d362288a59cc78044221b01cb752e0f5f40810707e6377b09c
c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
case "$XBPS_TARGET_MACHINE" in
From b0c045060acbfccbdd5cf29f05723670bd0e6f13 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Fri, 22 Sep 2023 19:22:42 +0200
Subject: [PATCH 2/2] nim: update to 2.0.0
---
srcpkgs/nim/template | 33 ++++++---------------------------
1 file changed, 6 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index 175dcbaea8439..5a51f319235cb 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,41 +1,20 @@
# Template file for 'nim'
pkgname=nim
-version=1.6.14
+version=2.0.0
revision=1
_c1version=561b417c65791cd8356b5f73620914ceff845d10
-_nimbleversion=0.13.1
-build_wrksrc="Nim-$version"
+_nimbleversion=0.14.2
+hostmakedepends="git"
depends="gcc openssl-devel"
short_desc="Nim programming language"
maintainer="Orphaned <orphan@voidlinux.org>"
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/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
-checksum="0a31586a6194545be2cfb159189d0f39c8ced2ec134119f3d517dcada9b4aeea
- 71c823444c794a12da9027d19d6a717dd7759521ecbbe28190b08372142607ec
- e6aa8d9ee4b3ed0321dca329b4a38fa546771b9729984482fb50fe73d3777f5d"
-
-post_extract() {
- mv csources_v1-$_c1version $build_wrksrc/csources_v1
- mkdir $build_wrksrc/dist
- mv nimble-$_nimbleversion $build_wrksrc/dist/nimble
-}
+distfiles="https://nim-lang.org/download/nim-${version}.tar.xz"
+checksum="bd6101d840036fb78e93a69df6cf3f9fd0c21cd754b695ff84a3b4add8ed0af7"
do_build() {
- case "$XBPS_TARGET_MACHINE" in
- i686*)
- CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ucpu=i686 ${makejobs};;
- ppc|ppc-musl)
- CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ucpu=powerpc ${makejobs};;
- *)
- CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ${makejobs};;
- esac
-
+ sh build.sh
bin/nim c koch
./koch boot -d:release -d:danger
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] Update Nim packages
2023-09-22 17:25 [PR PATCH] Update Nim packages HiPhish
2023-09-22 17:27 ` HiPhish
2023-09-22 17:28 ` [PR PATCH] [Updated] " HiPhish
@ 2023-09-22 20:33 ` HiPhish
2023-09-22 20:38 ` [PR PATCH] [Updated] [WIP] " HiPhish
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: HiPhish @ 2023-09-22 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
There is an updated pull request by HiPhish against master on the void-packages repository
https://github.com/HiPhish/void-packages nim
https://github.com/void-linux/void-packages/pull/46187
Update Nim packages
#### 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
A patch file from https://github.com/void-linux/void-packages/pull/46187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nim-46187.patch --]
[-- Type: text/x-diff, Size: 6766 bytes --]
From 8321c378c24c1746452d09c05272513ac0d78de0 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Fri, 22 Sep 2023 15:40:33 +0200
Subject: [PATCH 1/2] choosenim: update to 0.8.4
---
.../choosenim/patches/system-libarchive.patch | 103 ------------------
srcpkgs/choosenim/template | 6 +-
2 files changed, 3 insertions(+), 106 deletions(-)
delete mode 100644 srcpkgs/choosenim/patches/system-libarchive.patch
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
deleted file mode 100644
index a4cab336e99d4..0000000000000
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git choosenim.nimble choosenim.nimble
-index 7ba9b36..dc47faa 100644
---- a/choosenim.nimble
-+++ b/choosenim.nimble
-@@ -14,7 +14,7 @@ skipExt = @["nim"]
- # Dependencies
-
- requires "nim >= 1.2.6", "nimble#8f7af86"
--requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "nimterop >= 0.6.12"
- #requires "libcurl >= 1.0.0" - OSX now uses httpclient
- requires "analytics >= 0.2.0"
- requires "osinfo >= 0.3.0"
-diff --git nimarchive/nimarchive/archive.nim nimarchive/nimarchive/archive.nim
-index 1d45140..d5361e0 100644
---- a/nimarchive/nimarchive/archive.nim
-+++ b/nimarchive/nimarchive/archive.nim
-@@ -2,28 +2,6 @@ import os, strutils
-
- import nimterop/[build, cimport]
-
--const
-- baseDir = getProjectCacheDir("nimarchive" / "libarchive")
--
-- defs = """
-- archiveStatic
-- archiveJBB
-- archiveSetVer=3.4.3
--
-- iconvStatic
-- iconvStd
-- iconvJBB
-- iconvSetVer=1.16.0
-- """
--
--setDefines(defs.splitLines())
--
--getHeader(
-- header = "archive.h",
-- outdir = baseDir,
-- jbburi = "LibArchive",
-- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=LibArchive-v$1/ skip=libiconv"
--)
-
- import iconv
-
-@@ -52,9 +30,7 @@ static:
- cSkipSymbol(@["archive_read_open_file", "archive_write_open_file"])
-
- let
-- archiveEntryPath {.compileTime.} = archivePath[0 .. ^3] & "_entry.h"
-+ archivePath {.compileTime.} = "archive.h"
-+ archiveEntryPath {.compileTime.} = "archive_entry.h"
-
--when archiveStatic:
-- cImport(@[archivePath, archiveEntryPath], recurse = true)
--else:
-- cImport(@[archivePath, archiveEntryPath], recurse = true, dynlib = archiveLPath)
-+cImport(@[archivePath, archiveEntryPath], recurse = false)
-diff --git nimarchive/nimarchive/iconv.nim nimarchive/nimarchive/iconv.nim
-index d983398..4f61a5b 100644
---- a/nimarchive/nimarchive/iconv.nim
-+++ b/nimarchive/nimarchive/iconv.nim
-@@ -2,15 +2,3 @@ import os, strutils
-
- import nimterop/build
-
--const
-- baseDir = getProjectCacheDir("nimarchive" / "iconv")
--
--getHeader(
-- header = "iconv.h",
-- dlurl = "https://ftp.gnu.org/gnu/libiconv/libiconv-$1.tar.gz",
-- conanuri = "libiconv",
-- jbburi = "Libiconv",
-- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=Libiconv-v$1/",
-- outdir = baseDir,
-- conFlags = "--enable-static=yes --with-pic=yes"
--)
-diff --git src/choosenimpkg/ssl.nim src/choosenimpkg/ssl.nim
-index f20b246..7576066 100644
---- a/src/choosenimpkg/ssl.nim
-+++ b/src/choosenimpkg/ssl.nim
-@@ -2,19 +2,3 @@ import strutils
-
- import nimterop/[build, cimport]
-
--# Download openssl from JuliaBinaryWrappers
--setDefines(@[
-- "cryptoJBB", "cryptoStatic"
--])
--
--getHeader(
-- "crypto.h",
-- jbburi = "openssl",
-- outdir = getProjectCacheDir("nimopenssl")
--)
--
--const
-- sslLPath = cryptoLPath.replace("crypto", "ssl")
--
--# Link static binaries
--{.passL: sslLPath & " " & cryptoLPath.}
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index 064dbbbdf4d52..47225018d1c4a 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,7 +1,7 @@
# Template file for 'choosenim'
pkgname=choosenim
-version=0.7.4
-revision=3
+version=0.8.4
+revision=1
create_wrksrc=yes
hostmakedepends="git nim openssl-devel pkg-config"
makedepends="openssl-devel zlib-devel libarchive-devel"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/dom96/choosenim"
distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
-checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
+checksum="c849fb531a3b19d362288a59cc78044221b01cb752e0f5f40810707e6377b09c
c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
case "$XBPS_TARGET_MACHINE" in
From 07da620da469a851550f78006102af20b203b5ae Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Fri, 22 Sep 2023 19:22:42 +0200
Subject: [PATCH 2/2] nim: update to 2.0.0
---
srcpkgs/nim/template | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index 175dcbaea8439..c5e88e58a0d4e 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,41 +1,31 @@
# Template file for 'nim'
pkgname=nim
-version=1.6.14
+version=2.0.0
revision=1
_c1version=561b417c65791cd8356b5f73620914ceff845d10
-_nimbleversion=0.13.1
-build_wrksrc="Nim-$version"
+_nimbleversion=0.14.2
+hostmakedepends="git"
depends="gcc openssl-devel"
short_desc="Nim programming language"
maintainer="Orphaned <orphan@voidlinux.org>"
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/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
-checksum="0a31586a6194545be2cfb159189d0f39c8ced2ec134119f3d517dcada9b4aeea
- 71c823444c794a12da9027d19d6a717dd7759521ecbbe28190b08372142607ec
- e6aa8d9ee4b3ed0321dca329b4a38fa546771b9729984482fb50fe73d3777f5d"
-
-post_extract() {
- mv csources_v1-$_c1version $build_wrksrc/csources_v1
- mkdir $build_wrksrc/dist
- mv nimble-$_nimbleversion $build_wrksrc/dist/nimble
-}
+distfiles="https://nim-lang.org/download/nim-${version}.tar.xz"
+checksum="bd6101d840036fb78e93a69df6cf3f9fd0c21cd754b695ff84a3b4add8ed0af7"
do_build() {
case "$XBPS_TARGET_MACHINE" in
i686*)
CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ucpu=i686 ${makejobs};;
+ sh build.sh --cpu=i686;;
ppc|ppc-musl)
CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ucpu=powerpc ${makejobs};;
+ sh build.sh --cpu=powerpc;;
*)
CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ${makejobs};;
+ sh build.sh;;
esac
-
+ # sh build.sh
bin/nim c koch
./koch boot -d:release -d:danger
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Update Nim packages
2023-09-22 17:25 [PR PATCH] Update Nim packages HiPhish
` (2 preceding siblings ...)
2023-09-22 20:33 ` HiPhish
@ 2023-09-22 20:38 ` HiPhish
2023-09-22 22:39 ` HiPhish
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: HiPhish @ 2023-09-22 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
There is an updated pull request by HiPhish against master on the void-packages repository
https://github.com/HiPhish/void-packages nim
https://github.com/void-linux/void-packages/pull/46187
[WIP] Update Nim packages
#### 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
A patch file from https://github.com/void-linux/void-packages/pull/46187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nim-46187.patch --]
[-- Type: text/x-diff, Size: 6749 bytes --]
From 8321c378c24c1746452d09c05272513ac0d78de0 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Fri, 22 Sep 2023 15:40:33 +0200
Subject: [PATCH 1/2] choosenim: update to 0.8.4
---
.../choosenim/patches/system-libarchive.patch | 103 ------------------
srcpkgs/choosenim/template | 6 +-
2 files changed, 3 insertions(+), 106 deletions(-)
delete mode 100644 srcpkgs/choosenim/patches/system-libarchive.patch
diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch
deleted file mode 100644
index a4cab336e99d4..0000000000000
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git choosenim.nimble choosenim.nimble
-index 7ba9b36..dc47faa 100644
---- a/choosenim.nimble
-+++ b/choosenim.nimble
-@@ -14,7 +14,7 @@ skipExt = @["nim"]
- # Dependencies
-
- requires "nim >= 1.2.6", "nimble#8f7af86"
--requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-+requires "nimterop >= 0.6.12"
- #requires "libcurl >= 1.0.0" - OSX now uses httpclient
- requires "analytics >= 0.2.0"
- requires "osinfo >= 0.3.0"
-diff --git nimarchive/nimarchive/archive.nim nimarchive/nimarchive/archive.nim
-index 1d45140..d5361e0 100644
---- a/nimarchive/nimarchive/archive.nim
-+++ b/nimarchive/nimarchive/archive.nim
-@@ -2,28 +2,6 @@ import os, strutils
-
- import nimterop/[build, cimport]
-
--const
-- baseDir = getProjectCacheDir("nimarchive" / "libarchive")
--
-- defs = """
-- archiveStatic
-- archiveJBB
-- archiveSetVer=3.4.3
--
-- iconvStatic
-- iconvStd
-- iconvJBB
-- iconvSetVer=1.16.0
-- """
--
--setDefines(defs.splitLines())
--
--getHeader(
-- header = "archive.h",
-- outdir = baseDir,
-- jbburi = "LibArchive",
-- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=LibArchive-v$1/ skip=libiconv"
--)
-
- import iconv
-
-@@ -52,9 +30,7 @@ static:
- cSkipSymbol(@["archive_read_open_file", "archive_write_open_file"])
-
- let
-- archiveEntryPath {.compileTime.} = archivePath[0 .. ^3] & "_entry.h"
-+ archivePath {.compileTime.} = "archive.h"
-+ archiveEntryPath {.compileTime.} = "archive_entry.h"
-
--when archiveStatic:
-- cImport(@[archivePath, archiveEntryPath], recurse = true)
--else:
-- cImport(@[archivePath, archiveEntryPath], recurse = true, dynlib = archiveLPath)
-+cImport(@[archivePath, archiveEntryPath], recurse = false)
-diff --git nimarchive/nimarchive/iconv.nim nimarchive/nimarchive/iconv.nim
-index d983398..4f61a5b 100644
---- a/nimarchive/nimarchive/iconv.nim
-+++ b/nimarchive/nimarchive/iconv.nim
-@@ -2,15 +2,3 @@ import os, strutils
-
- import nimterop/build
-
--const
-- baseDir = getProjectCacheDir("nimarchive" / "iconv")
--
--getHeader(
-- header = "iconv.h",
-- dlurl = "https://ftp.gnu.org/gnu/libiconv/libiconv-$1.tar.gz",
-- conanuri = "libiconv",
-- jbburi = "Libiconv",
-- jbbFlags = "url=https://bintray.com/genotrance/binaries/download_file?file_path=Libiconv-v$1/",
-- outdir = baseDir,
-- conFlags = "--enable-static=yes --with-pic=yes"
--)
-diff --git src/choosenimpkg/ssl.nim src/choosenimpkg/ssl.nim
-index f20b246..7576066 100644
---- a/src/choosenimpkg/ssl.nim
-+++ b/src/choosenimpkg/ssl.nim
-@@ -2,19 +2,3 @@ import strutils
-
- import nimterop/[build, cimport]
-
--# Download openssl from JuliaBinaryWrappers
--setDefines(@[
-- "cryptoJBB", "cryptoStatic"
--])
--
--getHeader(
-- "crypto.h",
-- jbburi = "openssl",
-- outdir = getProjectCacheDir("nimopenssl")
--)
--
--const
-- sslLPath = cryptoLPath.replace("crypto", "ssl")
--
--# Link static binaries
--{.passL: sslLPath & " " & cryptoLPath.}
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index 064dbbbdf4d52..47225018d1c4a 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,7 +1,7 @@
# Template file for 'choosenim'
pkgname=choosenim
-version=0.7.4
-revision=3
+version=0.8.4
+revision=1
create_wrksrc=yes
hostmakedepends="git nim openssl-devel pkg-config"
makedepends="openssl-devel zlib-devel libarchive-devel"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/dom96/choosenim"
distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
-checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
+checksum="c849fb531a3b19d362288a59cc78044221b01cb752e0f5f40810707e6377b09c
c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
case "$XBPS_TARGET_MACHINE" in
From 1515d5e2fd8ffb5fb3aa8b3434b0ff77bf814502 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Fri, 22 Sep 2023 19:22:42 +0200
Subject: [PATCH 2/2] nim: update to 2.0.0
---
srcpkgs/nim/template | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index 175dcbaea8439..73fd4e77fd218 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,41 +1,30 @@
# Template file for 'nim'
pkgname=nim
-version=1.6.14
+version=2.0.0
revision=1
_c1version=561b417c65791cd8356b5f73620914ceff845d10
-_nimbleversion=0.13.1
-build_wrksrc="Nim-$version"
+_nimbleversion=0.14.2
+hostmakedepends="git"
depends="gcc openssl-devel"
short_desc="Nim programming language"
maintainer="Orphaned <orphan@voidlinux.org>"
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/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
-checksum="0a31586a6194545be2cfb159189d0f39c8ced2ec134119f3d517dcada9b4aeea
- 71c823444c794a12da9027d19d6a717dd7759521ecbbe28190b08372142607ec
- e6aa8d9ee4b3ed0321dca329b4a38fa546771b9729984482fb50fe73d3777f5d"
-
-post_extract() {
- mv csources_v1-$_c1version $build_wrksrc/csources_v1
- mkdir $build_wrksrc/dist
- mv nimble-$_nimbleversion $build_wrksrc/dist/nimble
-}
+distfiles="https://nim-lang.org/download/nim-${version}.tar.xz"
+checksum="bd6101d840036fb78e93a69df6cf3f9fd0c21cd754b695ff84a3b4add8ed0af7"
do_build() {
case "$XBPS_TARGET_MACHINE" in
i686*)
CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ucpu=i686 ${makejobs};;
+ sh build.sh --cpu i686;;
ppc|ppc-musl)
CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ucpu=powerpc ${makejobs};;
+ sh build.sh --cpu powerpc;;
*)
CC=cc LD=cc CFLAGS="-Os -pipe" LDFLAGS= \
- make -C csources_v1 ${makejobs};;
+ sh build.sh;;
esac
-
bin/nim c koch
./koch boot -d:release -d:danger
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Update Nim packages
2023-09-22 17:25 [PR PATCH] Update Nim packages HiPhish
` (3 preceding siblings ...)
2023-09-22 20:38 ` [PR PATCH] [Updated] [WIP] " HiPhish
@ 2023-09-22 22:39 ` HiPhish
2023-09-26 12:50 ` HiPhish
2023-09-26 12:50 ` [PR PATCH] [Closed]: " HiPhish
6 siblings, 0 replies; 8+ messages in thread
From: HiPhish @ 2023-09-22 22:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New comment by HiPhish on void-packages repository
https://github.com/void-linux/void-packages/pull/46187#issuecomment-1732100183
Comment:
@SolitudeSF Can you please review my choosenim update? I have removed the patch because everything seems to be working fine without it.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Update Nim packages
2023-09-22 17:25 [PR PATCH] Update Nim packages HiPhish
` (4 preceding siblings ...)
2023-09-22 22:39 ` HiPhish
@ 2023-09-26 12:50 ` HiPhish
2023-09-26 12:50 ` [PR PATCH] [Closed]: " HiPhish
6 siblings, 0 replies; 8+ messages in thread
From: HiPhish @ 2023-09-26 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by HiPhish on void-packages repository
https://github.com/void-linux/void-packages/pull/46187#issuecomment-1735480765
Comment:
Looks like someone already beat me to Nim 2.0, so I am closing this PR. I will open a new one for Choosenim only.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Closed]: Update Nim packages
2023-09-22 17:25 [PR PATCH] Update Nim packages HiPhish
` (5 preceding siblings ...)
2023-09-26 12:50 ` HiPhish
@ 2023-09-26 12:50 ` HiPhish
6 siblings, 0 replies; 8+ messages in thread
From: HiPhish @ 2023-09-26 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There's a closed pull request on the void-packages repository
Update Nim packages
https://github.com/void-linux/void-packages/pull/46187
Description:
#### 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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-09-26 12:50 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-22 17:25 [PR PATCH] Update Nim packages HiPhish
2023-09-22 17:27 ` HiPhish
2023-09-22 17:28 ` [PR PATCH] [Updated] " HiPhish
2023-09-22 20:33 ` HiPhish
2023-09-22 20:38 ` [PR PATCH] [Updated] [WIP] " HiPhish
2023-09-22 22:39 ` HiPhish
2023-09-26 12:50 ` HiPhish
2023-09-26 12:50 ` [PR PATCH] [Closed]: " HiPhish
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).