commit: 43f40336fce5ce0f3dd99364dc74484c67283829 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Fri Nov 21 23:33:10 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Sat Nov 22 00:27:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f40336
dev-lang/nim: bump to 2.2.6 Closes: https://bugs.gentoo.org/965881 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-lang/nim/Manifest | 1 + dev-lang/nim/files/nim-2.2.6-makefile.patch | 11 ++ dev-lang/nim/nim-2.2.6.ebuild | 188 ++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+) diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest index fb7a7523d17f..cffe3c4624dd 100644 --- a/dev-lang/nim/Manifest +++ b/dev-lang/nim/Manifest @@ -1,2 +1,3 @@ DIST nim-2.2.4.tar.xz 8168916 BLAKE2B 0dfa291e1685772371e26366468e469d098fd9ddab0453c905615757a619ef2c4393c24d4431e9166e2fa02101b26f10d12c29908cd60cc11c79b1cb58eb319b SHA512 02dea77bc4759a9772ff0e7648d98e40c499088d4cb66647a9ecf1df4c4434f80d42188205bd8c8a5b00c0ebe045fd98ac875104fc40ee7b913ba69b0bd13bbe +DIST nim-2.2.6.tar.xz 8471204 BLAKE2B d1107e3309d294c6f516402d20eff977158fbeb6159fa4d4c3f36764d0435cb66bf2ef5a5cc0c112e9916066497e0e1b4953216ffc037099b8870ff08716e2f9 SHA512 caa5fa311c473ffb930adb01f84d4e90da53c55d71afa4605a77e48593ecf3e46450da73fa761cad0e2a3aaef67393fc65538406e4c6f7608ef61692295aea7d DIST nim-atlas-0.8.0.tar.gz 59097 BLAKE2B 231b238ac3b15cc2c2d9ad927f80ae72d8ae4c649277515f32df6cc04275ccd38db5307d627572af547501e6522c06c86dc279dc3e13b5385f14e24032f6fe69 SHA512 747c13e2c5bd45a1dc6c1426f8c7637f638ada9dd4c9aa3edf4ef8367060e73226dc4bcde6380fac25ed47ebf4097fd223c72fadc3cceba8c71dd0f0571e47eb diff --git a/dev-lang/nim/files/nim-2.2.6-makefile.patch b/dev-lang/nim/files/nim-2.2.6-makefile.patch new file mode 100644 index 000000000000..2692f840c2a7 --- /dev/null +++ b/dev-lang/nim/files/nim-2.2.6-makefile.patch @@ -0,0 +1,11 @@ +--- a/makefile ++++ b/makefile +@@ -3,7 +3,7 @@ + # To regenerate run ``niminst csource`` or ``koch csource`` + + CC ?= gcc +-CFLAGS += -Ic_code -w -fmax-errors=3 -fno-strict-aliasing -O3 -fno-ident -fno-math-errno ++CFLAGS += -Ic_code -w -fno-strict-aliasing -fno-ident -fno-math-errno + LDFLAGS += + binDir = bin + diff --git a/dev-lang/nim/nim-2.2.6.ebuild b/dev-lang/nim/nim-2.2.6.ebuild new file mode 100644 index 000000000000..c3518162d0de --- /dev/null +++ b/dev-lang/nim/nim-2.2.6.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ATLAS_V="0.8.0" + +inherit edo multiprocessing shell-completion toolchain-funcs xdg-utils + +DESCRIPTION="Compiled, garbage-collected systems programming language" +HOMEPAGE="https://nim-lang.org/ + https://github.com/nim-lang/Nim/"; + +SRC_URI=" + https://nim-lang.org/download/${P}.tar.xz + https://github.com/nim-lang/atlas/archive/refs/tags/${ATLAS_V}.tar.gz + -> nim-atlas-${ATLAS_V}.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +IUSE="test-js test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-db/sqlite:3 + dev-libs/boehm-gc + dev-libs/libffi + dev-libs/libpcre:3 + dev-libs/openssl + media-libs/libsdl + media-libs/libsfml + test-js? ( + net-libs/nodejs + ) + ) +" + +PATCHES=( "${FILESDIR}/${PN}-2.2.6-makefile.patch" ) + +src_configure() { + xdg_environment_reset # bug #667182 + + unset NIMBLE_DIR + tc-export CC CXX LD + + mkdir -p "${HOME}/.parallel" || die + touch "${HOME}/.parallel/will-cite" || die "parallel setup failed" + + cat > nim.cfg <<- EOF || die "Failed to create Nim config" + cc:"gcc" + gcc.exe:"$(tc-getCC)" + gcc.linkerexe:"$(tc-getCC)" + gcc.cpp.exe:"$(tc-getCXX)" + gcc.cpp.linkerexe:"$(tc-getCXX)" + gcc.options.speed:"${CFLAGS}" + gcc.options.size:"${CFLAGS}" + gcc.options.debug:"${CFLAGS}" + gcc.options.always:"${CPPFLAGS}" + gcc.options.linker:"${LDFLAGS}" + gcc.cpp.options.speed:"${CXXFLAGS}" + gcc.cpp.options.size:"${CXXFLAGS}" + gcc.cpp.options.debug:"${CXXFLAGS}" + gcc.cpp.options.always:"${CPPFLAGS}" + gcc.cpp.options.linker:"${LDFLAGS}" + + $([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"') + -d:"release" + + # some tests don't work with processing hints + --processing:"off" + EOF + + cp -r "${WORKDIR}/atlas-${ATLAS_V}" "${S}/dist/atlas" || die + + mkdir -p "${S}/dist/atlas/dist" || die + cp -r "${S}/dist/nimble/vendor/sat" "${S}/dist/atlas/dist/sat" || die +} + +src_compile() { + emake CC="$(tc-getCC)" + + local -x PATH="${S}/bin:${PATH}" + local -a nimflags=( + -d:release + --listCmd + --parallelBuild:$(makeopts_jobs) + ) + + edo ./bin/nim compile "${nimflags[@]}" koch + edo ./koch boot "${nimflags[@]}" -d:nimUseLinenoise --skipParentCfg:off + edo ./koch tools "${nimflags[@]}" + edo ./bin/nim compile "${nimflags[@]}" ./tools/niminst/niminst.nim +} + +src_test() { + local -x PATH="${S}/bin:${PATH}" + local -a nimflags=( + # Leave only the safe hints enabled. + --hint:all:off + --hint:User:on + --hint:UserRaw:on + ) + local -a testament_args=( + --skipFrom:"${FILESDIR}/nim-2.2.2-testament-skipfile.txt" + --nim:"bin/nim" + --targets:"$(usex test-js 'c js' 'c')" + ) + + if [[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] ; then + testament_args+=( --colors:off ) + fi + + local -a categories=() + readarray -t categories < \ + <(find tests -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort) + + # AdditionalCategories from "testament/categories.nim". + categories+=( debugger examples lib ) + + local test_return=0 + + local tcat="" + local checkpoint="" + for tcat in "${categories[@]}"; do + # Use checkpoints for less painful testing. + checkpoint="${T}/.testament-${tcat}" + + if [[ -f "${checkpoint}" ]] ; then + continue + fi + + case "${tcat}" in + testdata ) + : + ;; + arc | async | coroutines | errmsgs | exception | gc | ic | \ + int | js | lent | msgs | objects | overflow | stdlib | \ + stylecheck | system | testament | untestable | valgrind ) + einfo "Skipped nim test category: ${tcat}" + ;; + * ) + einfo "Running tests in category '${tcat}'..." + nonfatal \ + edo ./bin/testament "${testament_args[@]}" \ + category "${tcat}" "${nimflags[@]}" \ + || test_return=1 + ;; + esac + + touch "${checkpoint}" || die + done + + if [[ "${test_return}" -eq 1 ]] ; then + die "tests failed, please inspect the failed test categories above" + fi +} + +src_install() { + local -x PATH="${S}/bin:${PATH}" + + edo ./koch install "${ED}/usr/lib" + dosym -r /usr/lib/nim/bin/nim /usr/bin/nim + + # "./koch install" installs only "nim" binary but not the rest. + local exe="" + while read -r exe ; do + einfo "Installing nim support tool: ${exe}" + + exeinto /usr/bin + doexe "${exe}" + done < \ + <(find ./bin -type f -not -iname nim) + + newbashcomp dist/nimble/nimble.bash-completion nimble + newbashcomp tools/nim.bash-completion nim + newzshcomp dist/nimble/nimble.zsh-completion _nimble + newzshcomp tools/nim.zsh-completion _nim + + # Install the @nim-rebuild set for Portage. + insinto /usr/share/portage/config/sets + newins "${FILESDIR}/nim-sets.conf" nim.conf + + einstalldocs +}
