[arch-commits] Commit in nim/trunk (PKGBUILD)

[Levente Polyak]

    Date: Sunday, May 22, 2022 @ 02:31:21
  Author: anthraxx
Revision: 1209949

upgpkg: nim 1.6.6-1

Modified:
  nim/trunk/PKGBUILD

----------+
 PKGBUILD |   35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-22 02:10:21 UTC (rev 1209948)
+++ PKGBUILD	2022-05-22 02:31:21 UTC (rev 1209949)
@@ -6,8 +6,8 @@
 
 pkgname=nim
 _pkgname=Nim
-pkgver=1.4.8
-_csourcesver=0.20.0
+pkgver=1.6.6
+_csourcesver=561b417c65791cd8356b5f73620914ceff845d10
 pkgrel=1
 pkgdesc='Imperative, multi-paradigm, compiled programming language'
 url='https://nim-lang.org/'
@@ -15,7 +15,9 @@
 license=('MIT')
 depends=('bash')
 makedepends=('git')
-optdepends=('nimble: Nim package manager')
+provides=('nimble')
+conflicts=('nimble')
+replaces=('nimble')
 options=('!emptydirs')
 backup=(
   etc/nim/nim.cfg
@@ -24,15 +26,15 @@
   etc/nim/rename.rules.cfg
 )
 source=(https://github.com/nim-lang/Nim/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
-        https://github.com/nim-lang/csources/archive/v${_csourcesver}/csources-${_csourcesver}.tar.gz)
-sha256sums=('8a687beb30670dc4eadcfefd1198d4238af283dc716438ac2342a7d65e07d9e9'
-            '5e6fd15d90df1a8cb7614c4ffc70aa8c4198cd854d7742016202b96dd0228d3c')
-b2sums=('7059d73cb7e2333911ed0ae1e55398255cfc32fd8732af80657343da9ba977fbdd6753737c7509aac4e7f9160cb9e3e4415f45770ee1cac15aeb780315346010'
-        'a1c026aa4ecd676d938d00f13f749b7c21094f87de98055ef0002bc96cafb81a780b7d82adfa3927bb32b0eb52c8047ac2b2c98d0ab3b9af0dd8c8ebeffad50b')
+        "git+https://github.com/nim-lang/csources_v1.git#commit=${_csourcesver}")
+sha256sums=('59836a85c1291b59af699a121b0b765703d6a0e44ed9f3ede363ff2b3e09d527'
+            'SKIP')
+b2sums=('5e7a986ee17e731815fb58a52747e56900e7d2cdc37c6aafa31378f27b4431b3bab8851c1aa67fd3ddeb235584db3ef8261fa276ce7221a591da780fe6487acd'
+        'SKIP')
 
 prepare() {
   cd ${_pkgname}-${pkgver}
-  mv ../csources-${_csourcesver} csources
+  cp -r ../csources_v1/* .
   rm bin/empty.txt
   for nimcfg in {compiler,config}/nim.cfg; do
     echo "gcc.options.always %= \"\${gcc.options.always} ${CFLAGS:-} ${CPPFLAGS}\"" >> "${nimcfg}"
@@ -45,9 +47,8 @@
   export PATH="${srcdir}/${_pkgname}-${pkgver}/bin:${PATH}"
 
   echo "Building nim"
-  (cd csources
-    sh build.sh
-  )
+  sh build.sh
+
   echo "Building koch"
   nim c -d:release koch
   ./koch boot -d:release -d:nativeStacktrace -d:useGnuReadline
@@ -62,6 +63,7 @@
   (cd tools
     nim c -d:release nimgrep.nim
   )
+
   echo "Building nimsuggest"
   nim c -d:release nimsuggest/nimsuggest.nim
 }
@@ -78,9 +80,6 @@
   install -Dm 644 compiler.nimble "${pkgdir}/usr/lib/nim/compiler"
   install -m 755 lib/libnimrtl.so "${pkgdir}/usr/lib/libnimrtl.so"
 
-  # Fix FS#48118, related to the doc2 command
-  ln -s /usr/share/nim/doc "${pkgdir}/usr/lib/nim/doc"
-
   install -Dm 644 config/* -t "${pkgdir}/etc/nim"
   install -Dm 755 bin/* -t "${pkgdir}/usr/bin"
 
@@ -88,8 +87,10 @@
   install -d "${pkgdir}/usr/include"
   cp -a "${pkgdir}/usr/lib/nim/"*.h "${pkgdir}/usr/include"
 
+  # Fix FS#48118, related to the doc2 command
+  ln -s /usr/share/nim/doc "${pkgdir}/usr/lib/nim/doc"
   install -d "${pkgdir}/usr/share/nim/doc"
-  cp -a examples doc/* "${pkgdir}/usr/share/nim/doc"
+  cp -a doc/* "${pkgdir}/usr/share/nim/doc"
 
   install -Dm 644 copying.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
 
@@ -102,7 +103,7 @@
   done
 
   rm -r "${pkgdir}/nim"
-  rm "${pkgdir}/usr/bin/nimble"
+  rm "${pkgdir}"/usr/bin/nim-gdb.bat
 }
 
 # vim: ts=2 sw=2 et: