v3.6

2 files changed, 98 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30044e6cf184..6f30cb6f732e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,46 @@
 pkgbase = nest
 	pkgdesc = Simulator for spiking neural network models
-	pkgver = 2.20.1
+	pkgver = 3.6
 	pkgrel = 1
 	url = https://www.nest-simulator.org/
 	arch = x86_64
-	license = GPL
+	license = GPL-2.0-or-later
+	makedepends = boost
 	makedepends = cmake
 	makedepends = cython
+	makedepends = gsl
+	makedepends = openmpi
+	makedepends = python-mpi4py
+	source = nest-3.6.tar.gz::https://github.com/nest/nest-simulator/archive/v3.6.tar.gz
+	sha256sums = 68d6b11791e1284dc94fef35d84c08dd7a11322c0f1e1fc9b39c5e6882284922
+
+pkgname = nest
+	depends = bash
+	depends = cblas
+	depends = gcc-libs
+	depends = glibc
 	depends = gsl
 	depends = libtool
+	depends = ncurses
+	depends = openmpi
 	depends = python
-	optdepends = ipython
-	optdepends = python-numpy
-	optdepends = python-scipy
-	optdepends = python-matplotlib
-	source = nest-2.20.1.tar.gz::https://github.com/nest/nest-simulator/archive/v2.20.1.tar.gz
-	sha256sums = df3d32b5899d5d444f708037b290f889ac6ff8eae6b7be9e9faee2c0d660d8e5
-
-pkgname = nest
+	depends = python-docopt
+	depends = python-mpi4py
+	depends = python-nest
+	depends = readline
 
+pkgname = python-nest
+	pkgdesc = Simulator for spiking neural network models (python bindings)
+	depends = gcc-libs
+	depends = glibc
+	depends = ipython
+	depends = python
+	depends = python-flask
+	depends = python-flask-cors
+	depends = python-h5py
+	depends = python-matplotlib
+	depends = python-numpy
+	depends = python-pandas
+	depends = python-pydot
+	depends = python-scipy
+	depends = python-werkzeug
diff --git a/PKGBUILD b/PKGBUILD
index 3a68a01395ea..9a59d5d93f03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,78 @@
-# Maintainer: Andrew Sun <adsun701 at gmail dot com>
+# Maintainer:
+# Contributor: Andrew Sun <adsun701 at gmail dot com>
 # Contributor: Paulo Castro <p dot oliveira dot castro at gmail dot com>
 
-pkgname=nest
-pkgver=2.20.1
+pkgbase=nest
+pkgname=(nest python-nest)
+pkgver=3.6
 pkgrel=1
 pkgdesc="Simulator for spiking neural network models"
 arch=('x86_64')
 url="https://www.nest-simulator.org/"
-license=('GPL')
-depends=('gsl' 'libtool' 'python')
-makedepends=('cmake' 'cython')
-optdepends=('ipython' 'python-numpy' 'python-scipy' 'python-matplotlib')
+license=('GPL-2.0-or-later')
+makedepends=('boost' 'cmake' 'cython' 'gsl' 'openmpi' 'python-mpi4py')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/nest/nest-simulator/archive/v${pkgver}.tar.gz")
-sha256sums=('df3d32b5899d5d444f708037b290f889ac6ff8eae6b7be9e9faee2c0d660d8e5')
+sha256sums=('68d6b11791e1284dc94fef35d84c08dd7a11322c0f1e1fc9b39c5e6882284922')
 
 build() {
-  mkdir -p "${srcdir}/build" && cd "${srcdir}/build"
-  cmake "${srcdir}/${pkgname}-simulator-${pkgver}" \
+  cmake -B build -S "${pkgname}-simulator-${pkgver}" \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
+    -Dwith-boost=ON \
     -Dwith-gsl=ON \
-    -Dwith-readline=ON \
-    -Dwith-ltdl=ON \
-    -Dwith-python=3
-  make
+    -Dwith-mpi=ON \
+    -Dwith-python=ON \
+    -Wno-dev
+  cmake --build build
+  DESTDIR="fakeinstall" cmake --install build
 }
 
-# Tests fail if no nest can be found in /usr/bin/
-#check() {
-#  cd "${srcdir}/build"
-#  make -k check
-#}
+_install() {
+  local src f dest
+  for src; do
+    f="${src#fakeinstall/}"
+    dest="${pkgdir}/${f%/*}"
+    install -dm755 "${dest}"
+    mv -v "${src}" "${dest}"
+  done
+}
+
+package_nest() {
+  depends=('bash'
+           'cblas'
+           'gcc-libs'
+           'glibc'
+           'gsl'
+           'libtool'
+           'ncurses'
+           'openmpi'
+           'python'
+           'python-docopt'
+           'python-mpi4py'
+           'python-nest'
+           'readline')
+
+  _install fakeinstall/usr/bin
+  _install fakeinstall/usr/include/nest
+  _install fakeinstall/usr/lib/nest
+  _install fakeinstall/usr/share/nest/sli
+}
+
+package_python-nest() {
+  pkgdesc+=" (python bindings)"
+  depends=('gcc-libs'
+           'glibc'
+           'ipython'
+           'python'
+           'python-flask'
+           'python-flask-cors'
+           'python-h5py'
+           'python-matplotlib'
+           'python-numpy'
+           'python-pandas'
+           'python-pydot'
+           'python-scipy'
+           'python-werkzeug')
 
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-  cd pynest
-  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  _install fakeinstall/usr/lib/python*
 }