Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nim: update to 2.2.0 #22413

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions mingw-w64-nim/0003-Fix-library-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ diff --git a/compiler/options.nim b/compiler/options.nim
index b4d2bb64e..05bc696e4 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -465,7 +465,8 @@ proc setDefaultLibpath*(conf: ConfigRef) =
else:
conf.libpath = prefix / RelativeDir"lib"
else:
- conf.libpath = prefix / RelativeDir"lib"
+ conf.libpath = prefix / RelativeDir"lib/nim"
+ if not dirExists(conf.libpath.string): conf.libpath = prefix / RelativeDir"lib"
@@ -752,7 +752,8 @@
if conf.libpath.isEmpty:
# choose default libpath:
var prefix = getPrefixDir(conf)
- conf.libpath = prefix / RelativeDir"lib"
+ conf.libpath = prefix / RelativeDir"lib/nim"
+ if not dirExists(conf.libpath.string): conf.libpath = prefix / RelativeDir"lib"

# Special rule to support other tools (nimble) which import the compiler
# modules and make use of them.
16 changes: 0 additions & 16 deletions mingw-w64-nim/0006-Fix-sqlite3-dll-name.patch

This file was deleted.

19 changes: 8 additions & 11 deletions mingw-w64-nim/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
_realname=nim
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.6.12
_csourcesver=561b417c65791cd8356b5f73620914ceff845d10
pkgver=2.2.0
_csourcesver=86742fb02c6606ab01a532a0085784effb2e753e
pkgrel=1
pkgdesc='Imperative, multi-paradigm, compiled programming language (mingw-w64)'
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
mingw_arch=('mingw64' 'ucrt64' 'clang64')
url='https://nim-lang.org/'
msys2_references=(
"cpe: cpe:/a:nim-lang:nim"
Expand All @@ -20,36 +20,33 @@ license=('MIT')
makedepends=('git' "${MINGW_PACKAGE_PREFIX}-cc")
options=(!emptydirs)
source=("${_realname}-${pkgver}.tar.gz"::https://github.com/nim-lang/Nim/archive/v${pkgver}.tar.gz
"git+https://github.com/nim-lang/csources_v1.git#commit=${_csourcesver}"
"git+https://github.com/nim-lang/csources_v2.git#commit=${_csourcesver}"
"0001-Use-unixy-filenames-even-on-Windows.patch"
"0002-Fix-config-path.patch"
"0003-Fix-library-path.patch"
"0004-Fix-nimrtl-dll-name.patch"
"0005-Fix-pcre-dll-name.patch"
"0006-Fix-sqlite3-dll-name.patch"
"0007-Fix-openssl-dll-name.patch")
sha256sums=('0ce3f0aa9bbf91ecba0ccd812e62294f83eb37c985c466c57ae25c04aedd330b'
'SKIP'
sha256sums=('5fc7059f777a665df09465419d187ac2911548715fbb31ccb78d51704ece1784'
'130a6d21808f43da421057385a5a8fd0a6ebd0d211211d3edd645eefd4fc7087'
'3010acbe7769ea214dd51f5889e3a26b44925001905deb04b060beaede2578f4'
'e4616080589f8140dbf4e4dc8afff1dddd95c93af51e2754bd84606cee415386'
'214e5835c9220b2f2951c9b1d62a1ab44f73e4d0f6dbabf3b284405ddac2c78f'
'a4b83a835ab1ac3687c38623a7023a62390a903f19d710ca861e9cdcf51dad6a'
'35a60e8c4ccff04ac9adb4b7d13c6e1e72b96dac9361173e4a44b1662107eea3'
'fa475808c100a86174ae348faaa4048d09e56406cb54c2f795da9d733605b003'
'008a090cf561124796daaab8390f495bc740a4ec8936eb96bc025cee6e017e3d'
'371a3133fd00d748199364ce2c6a2c23e0105c20fa236b46c2d7f61f2ffd7442')

prepare() {
cd "${srcdir}"

cd "${_realname}-${pkgver}"
cp -r ../csources_v1/* .
cp -r ../csources_v2/* .

patch -p1 -i "${srcdir}/0001-Use-unixy-filenames-even-on-Windows.patch"
patch -p1 -i "${srcdir}/0002-Fix-config-path.patch"
patch -p1 -i "${srcdir}/0003-Fix-library-path.patch"
patch -p1 -i "${srcdir}/0004-Fix-nimrtl-dll-name.patch"
patch -p1 -i "${srcdir}/0005-Fix-pcre-dll-name.patch"
patch -p1 -i "${srcdir}/0006-Fix-sqlite3-dll-name.patch"
patch -b -p1 -i "${srcdir}/0007-Fix-openssl-dll-name.patch"

if [[ ${MSYSTEM} == CLANG* ]]; then
Expand Down
Loading