Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] New packages: guile3, guix
@ 2020-05-27 17:35 ericonr
  2020-05-27 17:36 ` [PR PATCH] [Updated] " ericonr
                   ` (22 more replies)
  0 siblings, 23 replies; 24+ messages in thread
From: ericonr @ 2020-05-27 17:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 700 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages guile
https://github.com/void-linux/void-packages/pull/22359

[WIP] New packages: guile3, guix
Supersedes #22304 

- Added 3 as suffix for the guile3 executables.
- Update aisleriot, switch to guile3.
- Added dependencies for guix. I think there may be better ways of packaging them, but I'm not entirely sure. I have to fix the fact that they depend (for runtime) on the `-devel` version of other libraries, too.
- Package guix. Still needs a service file for `guix-daemon`.

A patch file from https://github.com/void-linux/void-packages/pull/22359.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22359.patch --]
[-- Type: text/x-diff, Size: 19613 bytes --]

From ce3047350e7d31a2eb1b679afa215b81e76dc507 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 20:01:03 -0700
Subject: [PATCH 01/10] New package: guile3-3.0.2

---
 common/shlibs           |  2 ++
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 51 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 55 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 09fd2f33a73..92feb8b5706 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,3 +3889,5 @@ libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
 libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..fe78c593f47
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+wrksrc=guile-${version}
+build_style=gnu-configure
+configure_args="--disable-static --disable-error-on-warning --program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+subpackages="libguile3 guile3-devel"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	# magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*) export CFLAGS+=" -Os";;
+	esac
+}
+
+libguile3_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel gc-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/share/aclocal
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From d6df283fec12ee40b24b6af268034fdbfe811a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:02 -0300
Subject: [PATCH 02/10] gnutls: generate Guile 3.0 bindings

---
 srcpkgs/gnutls/patches/gnutls-guile3.patch | 19 +++++++++++++++++++
 srcpkgs/gnutls/template                    | 12 ++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/gnutls-guile3.patch

diff --git a/srcpkgs/gnutls/patches/gnutls-guile3.patch b/srcpkgs/gnutls/patches/gnutls-guile3.patch
new file mode 100644
index 00000000000..745dc2cdc1d
--- /dev/null
+++ b/srcpkgs/gnutls/patches/gnutls-guile3.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 04:58:09.858735786 -0300
+--- configure.ac	2020-05-27 04:53:37.731383580 -0300
+***************
+*** 964,970 ****
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
+--- 964,970 ----
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf3])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 95bfab6a3f2..67e79f19eba 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,17 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.13
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_if guile --enable-guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which
+ $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +20,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }

From 698ed87198ec0b089b204ceccb307c29654debdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:30 -0300
Subject: [PATCH 03/10] aisleriot: update to 3.22.11

- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile
- Add yelp dep for viewing help info
---
 srcpkgs/aisleriot/template | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 40d46895aa4..c6294d9bc55 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,29 +1,19 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.9
+version=3.22.11
 revision=1
-_pysol_cardsets=PySolFC-Cardsets
-_pysol_ver=2.0
-build_style=gnu-configure
-configure_args="--with-platform=gtk-only
- --with-pysol-card-theme-path=${XBPS_BUILDDIR}/${_pysol_cardsets}-${_pysol_ver}"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config"
-makedepends="gc-devel guile-devel libcanberra-devel librsvg-devel
- libatomic_ops-devel"
-depends="aisleriot-data guile"
+wrksrc="${pkgname}-${version}-08104246822df8286d3f0d7b30b697d644ddc656"
+build_style=meson
+# build requires assertions to be turned on -> n_debug=false
+configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
+ -Dtheme_kde=false -Db_ndebug=false"
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
+ pysolfc-cardsets"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="guile3 yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
- http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
- c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
-
-aisleriot-data_package() {
-	short_desc+=" - data"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share
-	}
-}
+distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz"
+checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b

From c73e9ab7f24f7db839101cc964ab4c73722522fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:13:54 -0300
Subject: [PATCH 04/10] New package: scheme-bytestructures-1.0.7

Dependency for guile3-git
---
 srcpkgs/scheme-bytestructures/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/scheme-bytestructures/template

diff --git a/srcpkgs/scheme-bytestructures/template b/srcpkgs/scheme-bytestructures/template
new file mode 100644
index 00000000000..55da4ba01df
--- /dev/null
+++ b/srcpkgs/scheme-bytestructures/template
@@ -0,0 +1,23 @@
+# Template file for 'scheme-bytestructures'
+pkgname=scheme-bytestructures
+version=1.0.7
+revision=1
+build_style=gnu-configure
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="automake pkg-config guile3"
+makedepends="guile3-devel"
+depends=""
+short_desc="Structured access to bytevector contents"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/TaylanUB/scheme-bytestructures"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=cb5202289b0aa4fe470bf16a44b810631863afd48bf2677fd4bf53af017b52c8
+
+pre_configure() {
+	autoreconf -vfi
+}

From d56022f65bcf13360c424baaff9b79ce1744bfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:16:36 -0300
Subject: [PATCH 05/10] New package: guile-git-0.3.0

Dependency for guix.
---
 srcpkgs/guile-git/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-git/template

diff --git a/srcpkgs/guile-git/template b/srcpkgs/guile-git/template
new file mode 100644
index 00000000000..81282341ef2
--- /dev/null
+++ b/srcpkgs/guile-git/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-git'
+pkgname=guile-git
+version=0.3.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 texinfo"
+makedepends="libgit2-devel guile3-devel scheme-bytestructures"
+depends="scheme-bytestructures libgit2-devel"
+short_desc="Guile 3 bindings of libgit2"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/guile-git/guile-git"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=e12fc747cc817e60be07fea44126b077b292dbd1e96a5bee766754d5cc7e4a05
+
+pre_configure() {
+	autoreconf -vfi
+}

From dfb6ce78e6e76031e601ce5bd7e67061164aaf88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:18:18 -0300
Subject: [PATCH 06/10] New package: guile-ssh-0.12.0

Dependency for guix.
---
 .../allow-build-with-guile-3.0-guild.patch    | 19 +++++++++++++++++++
 .../allow-build-with-guile-3.0-snarf.patch    | 17 +++++++++++++++++
 srcpkgs/guile-ssh/template                    | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
 create mode 100644 srcpkgs/guile-ssh/template

diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
new file mode 100644
index 00000000000..e47cee302fb
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 12:02:15.450830987 -0300
+--- configure.ac	2020-05-27 12:02:03.329824812 -0300
+***************
+*** 92,98 ****
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild`
+     AC_SUBST(GUILD)
+  fi
+  
+--- 92,98 ----
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild3`
+     AC_SUBST(GUILD)
+  fi
+  
diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
new file mode 100644
index 00000000000..b90ef05bdb0
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
@@ -0,0 +1,17 @@
+*** am/snarf	2020-01-05 13:19:18.000000000 -0300
+--- am/snarf	2020-05-27 12:02:42.774844905 -0300
+***************
+*** 1,6 ****
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
+--- 1,6 ----
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf3`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
diff --git a/srcpkgs/guile-ssh/template b/srcpkgs/guile-ssh/template
new file mode 100644
index 00000000000..9cf4a2ee39e
--- /dev/null
+++ b/srcpkgs/guile-ssh/template
@@ -0,0 +1,18 @@
+# Template file for 'guile-ssh'
+pkgname=guile-ssh
+version=0.12.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 libtool which texinfo"
+makedepends="guile3-devel libssh-devel"
+depends="libssh-devel"
+short_desc="SSH module for Guile based on libssh"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/artyom-poptsov/guile-ssh"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=d5b610fa0259187a824dfd26b11a415c1ca7b107912feea8b1a9e7c0fcfbe59c
+
+pre_configure() {
+	autoreconf -vfi
+}

From 9e07dfc6b60b8eb8d1b8902fd8ac6af26f060a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:21:14 -0300
Subject: [PATCH 07/10] New package: guile-gcrypt-0.3.0

Dependency for guix.
---
 srcpkgs/guile-gcrypt/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-gcrypt/template

diff --git a/srcpkgs/guile-gcrypt/template b/srcpkgs/guile-gcrypt/template
new file mode 100644
index 00000000000..7210f5f50d4
--- /dev/null
+++ b/srcpkgs/guile-gcrypt/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-gcrypt'
+pkgname=guile-gcrypt
+version=0.3.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake guile3 pkg-config texinfo"
+makedepends="libgcrypt-devel guile3-devel"
+depends="libgcrypt-devel"
+short_desc="Guile 3 bindings for libgcrypt"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://notabug.org/cwebber/guile-gcrypt"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=07394c3de4f31a36ca2b670e1998c526de891d9436f12e94d8862ab081274d6a
+
+pre_configure() {
+	autoreconf -vfi
+}

From 3f91f0770a723855e3d7c2a3fbd4987a24bbc76a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:22:17 -0300
Subject: [PATCH 08/10] New package: guile-json

Dependency for guix.
---
 srcpkgs/guile-json/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/guile-json/template

diff --git a/srcpkgs/guile-json/template b/srcpkgs/guile-json/template
new file mode 100644
index 00000000000..9657b6f7589
--- /dev/null
+++ b/srcpkgs/guile-json/template
@@ -0,0 +1,14 @@
+# Template file for 'guile-json'
+pkgname=guile-json
+version=3.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config guile3"
+makedepends="guile3-devel"
+depends=""
+short_desc="JSON module for Guile"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://savannah.nongnu.org/projects/guile-json/"
+distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=ceb7357308d75a9c49dabbddaecf60c9731eda3512b9275a79bb508f628c783d

From cb679c1eb50de24ac0dbf9a2dcdb3229efdcc8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:23:06 -0300
Subject: [PATCH 09/10] New package: guile-sqlit3

Dependency for guix.
---
 .../patches/allow-build-with-guile-3.0.patch  | 19 +++++++++++++++++++
 srcpkgs/guile-sqlite3/template                | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
 create mode 100644 srcpkgs/guile-sqlite3/template

diff --git a/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
new file mode 100644
index 00000000000..3196e9df051
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
@@ -0,0 +1,19 @@
+*** configure.old	2020-05-27 06:34:42.422898841 -0300
+--- configure.ac	2020-05-27 06:34:25.983868381 -0300
+***************
+*** 14,20 ****
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
+--- 14,20 ----
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([3.0 2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
diff --git a/srcpkgs/guile-sqlite3/template b/srcpkgs/guile-sqlite3/template
new file mode 100644
index 00000000000..abaa0c247b3
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-sqlite3'
+pkgname=guile-sqlite3
+version=0.1.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3"
+makedepends="sqlite-devel guile3-devel"
+depends="sqlite-devel"
+short_desc="Guile bindings to SQLite"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="LGPL-3.0-or-later"
+homepage="https://notabug.org/guile-sqlite3/guile-sqlite3"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7501cd60bc693e581dc3e153f418279e1e1637c0760bc4524af6eb2d8eac2fe9
+
+pre_configure() {
+	autoreconf -vfi
+}

From 9152cfce2eeafbb447a48bc3536d9efa90402ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:25:50 -0300
Subject: [PATCH 10/10] New package: guix-1.1.0

---
 srcpkgs/guix/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/guix/template

diff --git a/srcpkgs/guix/template b/srcpkgs/guix/template
new file mode 100644
index 00000000000..09d833d6584
--- /dev/null
+++ b/srcpkgs/guix/template
@@ -0,0 +1,18 @@
+# Template file for 'guix'
+pkgname=guix
+version=1.1.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-bash-completion-dir=${DESTDIR}/usr/share/bash-completion/completions
+ --with-fish-completion-dir=${DESTDIR}/usr/share/fish/vendor_completions.d
+ --with-zsh-completion-dir=${DESTDIR}/usr/share/zsh/site_functions"
+hostmakedepends="guile3 pkg-config"
+_guile_libs="guile-git guile-json guile-sqlite3 guile-gcrypt guile-ssh"
+makedepends="gnutls gnutls-devel guile3-devel ${_guile_libs} zlib-devel"
+depends="guile3 ${_guile_libs}"
+short_desc="Package management tool for the GNU system"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://guix.gnu.org/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=5c59106ff4ac497c6097686834b0c914109cf5e44eb6b94ebce818923043640f

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
@ 2020-05-27 17:36 ` ericonr
  2020-05-27 17:38 ` ericonr
                   ` (21 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-05-27 17:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages guile
https://github.com/void-linux/void-packages/pull/22359

[WIP] New packages: guile3, guix
Supersedes #22304 

- Added 3 as suffix for the guile3 executables.
- Update aisleriot, switch to guile3.
- Added dependencies for guix. I think there may be better ways of packaging them, but I'm not entirely sure. I have to fix the fact that they depend (for runtime) on the `-devel` version of other libraries, too.
- Package guix. Still needs a service file for `guix-daemon`.

A patch file from https://github.com/void-linux/void-packages/pull/22359.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22359.patch --]
[-- Type: text/x-diff, Size: 19614 bytes --]

From 7ca4ee21837e443d3b1b88fdc5513e82c61e222d Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 20:01:03 -0700
Subject: [PATCH 01/10] New package: guile3-3.0.2

---
 common/shlibs           |  2 ++
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 51 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 55 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 54a00e3150d..2d19f51176e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3958,3 +3958,5 @@ libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
 libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..fe78c593f47
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+wrksrc=guile-${version}
+build_style=gnu-configure
+configure_args="--disable-static --disable-error-on-warning --program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+subpackages="libguile3 guile3-devel"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	# magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*) export CFLAGS+=" -Os";;
+	esac
+}
+
+libguile3_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel gc-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/share/aclocal
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From 1953dead73d40d4867822122c9d3f8510cec4bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:02 -0300
Subject: [PATCH 02/10] gnutls: generate Guile 3.0 bindings

---
 srcpkgs/gnutls/patches/gnutls-guile3.patch | 19 +++++++++++++++++++
 srcpkgs/gnutls/template                    | 12 ++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/gnutls-guile3.patch

diff --git a/srcpkgs/gnutls/patches/gnutls-guile3.patch b/srcpkgs/gnutls/patches/gnutls-guile3.patch
new file mode 100644
index 00000000000..745dc2cdc1d
--- /dev/null
+++ b/srcpkgs/gnutls/patches/gnutls-guile3.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 04:58:09.858735786 -0300
+--- configure.ac	2020-05-27 04:53:37.731383580 -0300
+***************
+*** 964,970 ****
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
+--- 964,970 ----
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf3])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 95bfab6a3f2..67e79f19eba 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,17 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.13
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_if guile --enable-guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which
+ $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +20,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }

From a1fe2d94adda043d083cb2e3b5b87b40803c97d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:30 -0300
Subject: [PATCH 03/10] aisleriot: update to 3.22.11

- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile
- Add yelp dep for viewing help info
---
 srcpkgs/aisleriot/template | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 40d46895aa4..c6294d9bc55 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,29 +1,19 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.9
+version=3.22.11
 revision=1
-_pysol_cardsets=PySolFC-Cardsets
-_pysol_ver=2.0
-build_style=gnu-configure
-configure_args="--with-platform=gtk-only
- --with-pysol-card-theme-path=${XBPS_BUILDDIR}/${_pysol_cardsets}-${_pysol_ver}"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config"
-makedepends="gc-devel guile-devel libcanberra-devel librsvg-devel
- libatomic_ops-devel"
-depends="aisleriot-data guile"
+wrksrc="${pkgname}-${version}-08104246822df8286d3f0d7b30b697d644ddc656"
+build_style=meson
+# build requires assertions to be turned on -> n_debug=false
+configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
+ -Dtheme_kde=false -Db_ndebug=false"
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
+ pysolfc-cardsets"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="guile3 yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
- http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
- c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
-
-aisleriot-data_package() {
-	short_desc+=" - data"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share
-	}
-}
+distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz"
+checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b

From 3d16fa9916c638db5cb6bef4e489d9960fe8f8f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:13:54 -0300
Subject: [PATCH 04/10] New package: scheme-bytestructures-1.0.7

Dependency for guile3-git
---
 srcpkgs/scheme-bytestructures/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/scheme-bytestructures/template

diff --git a/srcpkgs/scheme-bytestructures/template b/srcpkgs/scheme-bytestructures/template
new file mode 100644
index 00000000000..55da4ba01df
--- /dev/null
+++ b/srcpkgs/scheme-bytestructures/template
@@ -0,0 +1,23 @@
+# Template file for 'scheme-bytestructures'
+pkgname=scheme-bytestructures
+version=1.0.7
+revision=1
+build_style=gnu-configure
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="automake pkg-config guile3"
+makedepends="guile3-devel"
+depends=""
+short_desc="Structured access to bytevector contents"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/TaylanUB/scheme-bytestructures"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=cb5202289b0aa4fe470bf16a44b810631863afd48bf2677fd4bf53af017b52c8
+
+pre_configure() {
+	autoreconf -vfi
+}

From dee118aa8ed21188c0af1f08347f3bbc43a1c57d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:16:36 -0300
Subject: [PATCH 05/10] New package: guile-git-0.3.0

Dependency for guix.
---
 srcpkgs/guile-git/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-git/template

diff --git a/srcpkgs/guile-git/template b/srcpkgs/guile-git/template
new file mode 100644
index 00000000000..81282341ef2
--- /dev/null
+++ b/srcpkgs/guile-git/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-git'
+pkgname=guile-git
+version=0.3.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 texinfo"
+makedepends="libgit2-devel guile3-devel scheme-bytestructures"
+depends="scheme-bytestructures libgit2-devel"
+short_desc="Guile 3 bindings of libgit2"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/guile-git/guile-git"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=e12fc747cc817e60be07fea44126b077b292dbd1e96a5bee766754d5cc7e4a05
+
+pre_configure() {
+	autoreconf -vfi
+}

From 24e4c94683ac35604ea316ef67ef58edf5f24fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:18:18 -0300
Subject: [PATCH 06/10] New package: guile-ssh-0.12.0

Dependency for guix.
---
 .../allow-build-with-guile-3.0-guild.patch    | 19 +++++++++++++++++++
 .../allow-build-with-guile-3.0-snarf.patch    | 17 +++++++++++++++++
 srcpkgs/guile-ssh/template                    | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
 create mode 100644 srcpkgs/guile-ssh/template

diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
new file mode 100644
index 00000000000..e47cee302fb
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 12:02:15.450830987 -0300
+--- configure.ac	2020-05-27 12:02:03.329824812 -0300
+***************
+*** 92,98 ****
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild`
+     AC_SUBST(GUILD)
+  fi
+  
+--- 92,98 ----
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild3`
+     AC_SUBST(GUILD)
+  fi
+  
diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
new file mode 100644
index 00000000000..b90ef05bdb0
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
@@ -0,0 +1,17 @@
+*** am/snarf	2020-01-05 13:19:18.000000000 -0300
+--- am/snarf	2020-05-27 12:02:42.774844905 -0300
+***************
+*** 1,6 ****
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
+--- 1,6 ----
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf3`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
diff --git a/srcpkgs/guile-ssh/template b/srcpkgs/guile-ssh/template
new file mode 100644
index 00000000000..9cf4a2ee39e
--- /dev/null
+++ b/srcpkgs/guile-ssh/template
@@ -0,0 +1,18 @@
+# Template file for 'guile-ssh'
+pkgname=guile-ssh
+version=0.12.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 libtool which texinfo"
+makedepends="guile3-devel libssh-devel"
+depends="libssh-devel"
+short_desc="SSH module for Guile based on libssh"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/artyom-poptsov/guile-ssh"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=d5b610fa0259187a824dfd26b11a415c1ca7b107912feea8b1a9e7c0fcfbe59c
+
+pre_configure() {
+	autoreconf -vfi
+}

From 5d2c2cf6117a6caf2c97be9e4b02a1437dbfbdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:21:14 -0300
Subject: [PATCH 07/10] New package: guile-gcrypt-0.3.0

Dependency for guix.
---
 srcpkgs/guile-gcrypt/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-gcrypt/template

diff --git a/srcpkgs/guile-gcrypt/template b/srcpkgs/guile-gcrypt/template
new file mode 100644
index 00000000000..7210f5f50d4
--- /dev/null
+++ b/srcpkgs/guile-gcrypt/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-gcrypt'
+pkgname=guile-gcrypt
+version=0.3.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake guile3 pkg-config texinfo"
+makedepends="libgcrypt-devel guile3-devel"
+depends="libgcrypt-devel"
+short_desc="Guile 3 bindings for libgcrypt"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://notabug.org/cwebber/guile-gcrypt"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=07394c3de4f31a36ca2b670e1998c526de891d9436f12e94d8862ab081274d6a
+
+pre_configure() {
+	autoreconf -vfi
+}

From 3d173673de3a88212d24b733e17ce54e2a25fc71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:22:17 -0300
Subject: [PATCH 08/10] New package: guile-json

Dependency for guix.
---
 srcpkgs/guile-json/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/guile-json/template

diff --git a/srcpkgs/guile-json/template b/srcpkgs/guile-json/template
new file mode 100644
index 00000000000..9657b6f7589
--- /dev/null
+++ b/srcpkgs/guile-json/template
@@ -0,0 +1,14 @@
+# Template file for 'guile-json'
+pkgname=guile-json
+version=3.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config guile3"
+makedepends="guile3-devel"
+depends=""
+short_desc="JSON module for Guile"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://savannah.nongnu.org/projects/guile-json/"
+distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=ceb7357308d75a9c49dabbddaecf60c9731eda3512b9275a79bb508f628c783d

From 5596918af6f83b3585ae9fb5a4ca8dd7138abcb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:23:06 -0300
Subject: [PATCH 09/10] New package: guile-sqlite3

Dependency for guix.
---
 .../patches/allow-build-with-guile-3.0.patch  | 19 +++++++++++++++++++
 srcpkgs/guile-sqlite3/template                | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
 create mode 100644 srcpkgs/guile-sqlite3/template

diff --git a/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
new file mode 100644
index 00000000000..3196e9df051
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
@@ -0,0 +1,19 @@
+*** configure.old	2020-05-27 06:34:42.422898841 -0300
+--- configure.ac	2020-05-27 06:34:25.983868381 -0300
+***************
+*** 14,20 ****
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
+--- 14,20 ----
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([3.0 2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
diff --git a/srcpkgs/guile-sqlite3/template b/srcpkgs/guile-sqlite3/template
new file mode 100644
index 00000000000..abaa0c247b3
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-sqlite3'
+pkgname=guile-sqlite3
+version=0.1.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3"
+makedepends="sqlite-devel guile3-devel"
+depends="sqlite-devel"
+short_desc="Guile bindings to SQLite"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="LGPL-3.0-or-later"
+homepage="https://notabug.org/guile-sqlite3/guile-sqlite3"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7501cd60bc693e581dc3e153f418279e1e1637c0760bc4524af6eb2d8eac2fe9
+
+pre_configure() {
+	autoreconf -vfi
+}

From 0b473582990926d5f1d978d25bf553dc68848966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:25:50 -0300
Subject: [PATCH 10/10] New package: guix-1.1.0

---
 srcpkgs/guix/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/guix/template

diff --git a/srcpkgs/guix/template b/srcpkgs/guix/template
new file mode 100644
index 00000000000..09d833d6584
--- /dev/null
+++ b/srcpkgs/guix/template
@@ -0,0 +1,18 @@
+# Template file for 'guix'
+pkgname=guix
+version=1.1.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-bash-completion-dir=${DESTDIR}/usr/share/bash-completion/completions
+ --with-fish-completion-dir=${DESTDIR}/usr/share/fish/vendor_completions.d
+ --with-zsh-completion-dir=${DESTDIR}/usr/share/zsh/site_functions"
+hostmakedepends="guile3 pkg-config"
+_guile_libs="guile-git guile-json guile-sqlite3 guile-gcrypt guile-ssh"
+makedepends="gnutls gnutls-devel guile3-devel ${_guile_libs} zlib-devel"
+depends="guile3 ${_guile_libs}"
+short_desc="Package management tool for the GNU system"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://guix.gnu.org/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=5c59106ff4ac497c6097686834b0c914109cf5e44eb6b94ebce818923043640f

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
  2020-05-27 17:36 ` [PR PATCH] [Updated] " ericonr
@ 2020-05-27 17:38 ` ericonr
  2020-05-27 18:32 ` ericonr
                   ` (20 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-05-27 17:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages guile
https://github.com/void-linux/void-packages/pull/22359

[WIP] New packages: guile3, guix
Supersedes #22304 

- Added 3 as suffix for the guile3 executables.
- Update aisleriot, switch to guile3.
- Added dependencies for guix. I think there may be better ways of packaging them, but I'm not entirely sure. I have to fix the fact that they depend (for runtime) on the `-devel` version of other libraries, too.
- Package guix. Still needs a service file for `guix-daemon`.

A patch file from https://github.com/void-linux/void-packages/pull/22359.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22359.patch --]
[-- Type: text/x-diff, Size: 19601 bytes --]

From 7ca4ee21837e443d3b1b88fdc5513e82c61e222d Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 20:01:03 -0700
Subject: [PATCH 01/10] New package: guile3-3.0.2

---
 common/shlibs           |  2 ++
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 51 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 55 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 54a00e3150d..2d19f51176e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3958,3 +3958,5 @@ libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
 libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..fe78c593f47
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+wrksrc=guile-${version}
+build_style=gnu-configure
+configure_args="--disable-static --disable-error-on-warning --program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+subpackages="libguile3 guile3-devel"
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	# magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*) export CFLAGS+=" -Os";;
+	esac
+}
+
+libguile3_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel gc-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/share/aclocal
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From 1953dead73d40d4867822122c9d3f8510cec4bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:02 -0300
Subject: [PATCH 02/10] gnutls: generate Guile 3.0 bindings

---
 srcpkgs/gnutls/patches/gnutls-guile3.patch | 19 +++++++++++++++++++
 srcpkgs/gnutls/template                    | 12 ++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/gnutls-guile3.patch

diff --git a/srcpkgs/gnutls/patches/gnutls-guile3.patch b/srcpkgs/gnutls/patches/gnutls-guile3.patch
new file mode 100644
index 00000000000..745dc2cdc1d
--- /dev/null
+++ b/srcpkgs/gnutls/patches/gnutls-guile3.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 04:58:09.858735786 -0300
+--- configure.ac	2020-05-27 04:53:37.731383580 -0300
+***************
+*** 964,970 ****
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
+--- 964,970 ----
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf3])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 95bfab6a3f2..67e79f19eba 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,17 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.13
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_if guile --enable-guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which
+ $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +20,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }

From a1fe2d94adda043d083cb2e3b5b87b40803c97d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:30 -0300
Subject: [PATCH 03/10] aisleriot: update to 3.22.11

- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile
- Add yelp dep for viewing help info
---
 srcpkgs/aisleriot/template | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 40d46895aa4..c6294d9bc55 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,29 +1,19 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.9
+version=3.22.11
 revision=1
-_pysol_cardsets=PySolFC-Cardsets
-_pysol_ver=2.0
-build_style=gnu-configure
-configure_args="--with-platform=gtk-only
- --with-pysol-card-theme-path=${XBPS_BUILDDIR}/${_pysol_cardsets}-${_pysol_ver}"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config"
-makedepends="gc-devel guile-devel libcanberra-devel librsvg-devel
- libatomic_ops-devel"
-depends="aisleriot-data guile"
+wrksrc="${pkgname}-${version}-08104246822df8286d3f0d7b30b697d644ddc656"
+build_style=meson
+# build requires assertions to be turned on -> n_debug=false
+configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
+ -Dtheme_kde=false -Db_ndebug=false"
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
+ pysolfc-cardsets"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="guile3 yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
- http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
- c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
-
-aisleriot-data_package() {
-	short_desc+=" - data"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share
-	}
-}
+distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz"
+checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b

From 3d16fa9916c638db5cb6bef4e489d9960fe8f8f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:13:54 -0300
Subject: [PATCH 04/10] New package: scheme-bytestructures-1.0.7

Dependency for guile3-git
---
 srcpkgs/scheme-bytestructures/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/scheme-bytestructures/template

diff --git a/srcpkgs/scheme-bytestructures/template b/srcpkgs/scheme-bytestructures/template
new file mode 100644
index 00000000000..55da4ba01df
--- /dev/null
+++ b/srcpkgs/scheme-bytestructures/template
@@ -0,0 +1,23 @@
+# Template file for 'scheme-bytestructures'
+pkgname=scheme-bytestructures
+version=1.0.7
+revision=1
+build_style=gnu-configure
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="automake pkg-config guile3"
+makedepends="guile3-devel"
+depends=""
+short_desc="Structured access to bytevector contents"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/TaylanUB/scheme-bytestructures"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=cb5202289b0aa4fe470bf16a44b810631863afd48bf2677fd4bf53af017b52c8
+
+pre_configure() {
+	autoreconf -vfi
+}

From dee118aa8ed21188c0af1f08347f3bbc43a1c57d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:16:36 -0300
Subject: [PATCH 05/10] New package: guile-git-0.3.0

Dependency for guix.
---
 srcpkgs/guile-git/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-git/template

diff --git a/srcpkgs/guile-git/template b/srcpkgs/guile-git/template
new file mode 100644
index 00000000000..81282341ef2
--- /dev/null
+++ b/srcpkgs/guile-git/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-git'
+pkgname=guile-git
+version=0.3.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 texinfo"
+makedepends="libgit2-devel guile3-devel scheme-bytestructures"
+depends="scheme-bytestructures libgit2-devel"
+short_desc="Guile 3 bindings of libgit2"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/guile-git/guile-git"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=e12fc747cc817e60be07fea44126b077b292dbd1e96a5bee766754d5cc7e4a05
+
+pre_configure() {
+	autoreconf -vfi
+}

From 24e4c94683ac35604ea316ef67ef58edf5f24fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:18:18 -0300
Subject: [PATCH 06/10] New package: guile-ssh-0.12.0

Dependency for guix.
---
 .../allow-build-with-guile-3.0-guild.patch    | 19 +++++++++++++++++++
 .../allow-build-with-guile-3.0-snarf.patch    | 17 +++++++++++++++++
 srcpkgs/guile-ssh/template                    | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
 create mode 100644 srcpkgs/guile-ssh/template

diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
new file mode 100644
index 00000000000..e47cee302fb
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 12:02:15.450830987 -0300
+--- configure.ac	2020-05-27 12:02:03.329824812 -0300
+***************
+*** 92,98 ****
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild`
+     AC_SUBST(GUILD)
+  fi
+  
+--- 92,98 ----
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild3`
+     AC_SUBST(GUILD)
+  fi
+  
diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
new file mode 100644
index 00000000000..b90ef05bdb0
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
@@ -0,0 +1,17 @@
+*** am/snarf	2020-01-05 13:19:18.000000000 -0300
+--- am/snarf	2020-05-27 12:02:42.774844905 -0300
+***************
+*** 1,6 ****
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
+--- 1,6 ----
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf3`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
diff --git a/srcpkgs/guile-ssh/template b/srcpkgs/guile-ssh/template
new file mode 100644
index 00000000000..9cf4a2ee39e
--- /dev/null
+++ b/srcpkgs/guile-ssh/template
@@ -0,0 +1,18 @@
+# Template file for 'guile-ssh'
+pkgname=guile-ssh
+version=0.12.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 libtool which texinfo"
+makedepends="guile3-devel libssh-devel"
+depends="libssh-devel"
+short_desc="SSH module for Guile based on libssh"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/artyom-poptsov/guile-ssh"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=d5b610fa0259187a824dfd26b11a415c1ca7b107912feea8b1a9e7c0fcfbe59c
+
+pre_configure() {
+	autoreconf -vfi
+}

From 5d2c2cf6117a6caf2c97be9e4b02a1437dbfbdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:21:14 -0300
Subject: [PATCH 07/10] New package: guile-gcrypt-0.3.0

Dependency for guix.
---
 srcpkgs/guile-gcrypt/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-gcrypt/template

diff --git a/srcpkgs/guile-gcrypt/template b/srcpkgs/guile-gcrypt/template
new file mode 100644
index 00000000000..7210f5f50d4
--- /dev/null
+++ b/srcpkgs/guile-gcrypt/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-gcrypt'
+pkgname=guile-gcrypt
+version=0.3.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake guile3 pkg-config texinfo"
+makedepends="libgcrypt-devel guile3-devel"
+depends="libgcrypt-devel"
+short_desc="Guile 3 bindings for libgcrypt"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://notabug.org/cwebber/guile-gcrypt"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=07394c3de4f31a36ca2b670e1998c526de891d9436f12e94d8862ab081274d6a
+
+pre_configure() {
+	autoreconf -vfi
+}

From 33c6c2727b57015b382b91b0388a652979dea85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:22:17 -0300
Subject: [PATCH 08/10] New package: guile-json

Dependency for guix.
---
 srcpkgs/guile-json/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/guile-json/template

diff --git a/srcpkgs/guile-json/template b/srcpkgs/guile-json/template
new file mode 100644
index 00000000000..3ec0e20650e
--- /dev/null
+++ b/srcpkgs/guile-json/template
@@ -0,0 +1,13 @@
+# Template file for 'guile-json'
+pkgname=guile-json
+version=3.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config guile3"
+makedepends="guile3-devel"
+short_desc="JSON module for Guile"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://savannah.nongnu.org/projects/guile-json/"
+distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=ceb7357308d75a9c49dabbddaecf60c9731eda3512b9275a79bb508f628c783d

From fbc205d58c5294b980737e818528aaaa1d4fcb4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:23:06 -0300
Subject: [PATCH 09/10] New package: guile-sqlite3

Dependency for guix.
---
 .../patches/allow-build-with-guile-3.0.patch  | 19 +++++++++++++++++++
 srcpkgs/guile-sqlite3/template                | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
 create mode 100644 srcpkgs/guile-sqlite3/template

diff --git a/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
new file mode 100644
index 00000000000..3196e9df051
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
@@ -0,0 +1,19 @@
+*** configure.old	2020-05-27 06:34:42.422898841 -0300
+--- configure.ac	2020-05-27 06:34:25.983868381 -0300
+***************
+*** 14,20 ****
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
+--- 14,20 ----
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([3.0 2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
diff --git a/srcpkgs/guile-sqlite3/template b/srcpkgs/guile-sqlite3/template
new file mode 100644
index 00000000000..abaa0c247b3
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-sqlite3'
+pkgname=guile-sqlite3
+version=0.1.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3"
+makedepends="sqlite-devel guile3-devel"
+depends="sqlite-devel"
+short_desc="Guile bindings to SQLite"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="LGPL-3.0-or-later"
+homepage="https://notabug.org/guile-sqlite3/guile-sqlite3"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7501cd60bc693e581dc3e153f418279e1e1637c0760bc4524af6eb2d8eac2fe9
+
+pre_configure() {
+	autoreconf -vfi
+}

From 8745bc12fc5744e621f4c45694717705ba0c1a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:25:50 -0300
Subject: [PATCH 10/10] New package: guix-1.1.0

---
 srcpkgs/guix/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/guix/template

diff --git a/srcpkgs/guix/template b/srcpkgs/guix/template
new file mode 100644
index 00000000000..09d833d6584
--- /dev/null
+++ b/srcpkgs/guix/template
@@ -0,0 +1,18 @@
+# Template file for 'guix'
+pkgname=guix
+version=1.1.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-bash-completion-dir=${DESTDIR}/usr/share/bash-completion/completions
+ --with-fish-completion-dir=${DESTDIR}/usr/share/fish/vendor_completions.d
+ --with-zsh-completion-dir=${DESTDIR}/usr/share/zsh/site_functions"
+hostmakedepends="guile3 pkg-config"
+_guile_libs="guile-git guile-json guile-sqlite3 guile-gcrypt guile-ssh"
+makedepends="gnutls gnutls-devel guile3-devel ${_guile_libs} zlib-devel"
+depends="guile3 ${_guile_libs}"
+short_desc="Package management tool for the GNU system"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://guix.gnu.org/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=5c59106ff4ac497c6097686834b0c914109cf5e44eb6b94ebce818923043640f

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
  2020-05-27 17:36 ` [PR PATCH] [Updated] " ericonr
  2020-05-27 17:38 ` ericonr
@ 2020-05-27 18:32 ` ericonr
  2020-05-27 21:04 ` travankor
                   ` (19 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-05-27 18:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-634858927

Comment:
Needs fixes for cross compilation.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (2 preceding siblings ...)
  2020-05-27 18:32 ` ericonr
@ 2020-05-27 21:04 ` travankor
  2020-05-28  0:32 ` [PR PATCH] [Updated] " ericonr
                   ` (18 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: travankor @ 2020-05-27 21:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-634938729

Comment:
>Still needs a service file for guix-daemon.

https://issues.guix.gnu.org/issue/40601#5

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (3 preceding siblings ...)
  2020-05-27 21:04 ` travankor
@ 2020-05-28  0:32 ` ericonr
  2020-05-28  0:34 ` ericonr
                   ` (17 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-05-28  0:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages guile
https://github.com/void-linux/void-packages/pull/22359

[WIP] New packages: guile3, guix
Supersedes #22304 

- Added 3 as suffix for the guile3 executables.
- Update aisleriot, switch to guile3.
- Added dependencies for guix. I think there may be better ways of packaging them, but I'm not entirely sure. I have to fix the fact that they depend (for runtime) on the `-devel` version of other libraries, too.
- Package guix. Still needs a service file for `guix-daemon`.

A patch file from https://github.com/void-linux/void-packages/pull/22359.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22359.patch --]
[-- Type: text/x-diff, Size: 19685 bytes --]

From 6a4fa3b08b6435a6b5545a9451665567bce2002d Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 20:01:03 -0700
Subject: [PATCH 01/10] New package: guile3-3.0.2

---
 common/shlibs           |  2 ++
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 51 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 55 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 54a00e3150d..2d19f51176e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3958,3 +3958,5 @@ libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
 libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..854ffb990b9
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+wrksrc=guile-${version}
+build_style=gnu-configure
+configure_args="--disable-static --disable-error-on-warning --program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	export GUILE_FOR_BUILD=guile3
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	# magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*) export CFLAGS+=" -Os";;
+	esac
+}
+
+libguile3_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel gc-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/share/aclocal
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From 3eca3abc1c3f24f2a901a853aa15913467ef0d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:02 -0300
Subject: [PATCH 02/10] gnutls: generate Guile 3.0 bindings

---
 srcpkgs/gnutls/patches/gnutls-guile3.patch | 19 +++++++++++++++++++
 srcpkgs/gnutls/template                    | 12 ++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/gnutls-guile3.patch

diff --git a/srcpkgs/gnutls/patches/gnutls-guile3.patch b/srcpkgs/gnutls/patches/gnutls-guile3.patch
new file mode 100644
index 00000000000..745dc2cdc1d
--- /dev/null
+++ b/srcpkgs/gnutls/patches/gnutls-guile3.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 04:58:09.858735786 -0300
+--- configure.ac	2020-05-27 04:53:37.731383580 -0300
+***************
+*** 964,970 ****
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
+--- 964,970 ----
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf3])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 95bfab6a3f2..67e79f19eba 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,17 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.13
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_if guile --enable-guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which
+ $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +20,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }

From 02b4250c0400e9e938334bcf37e51559f034df3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:30 -0300
Subject: [PATCH 03/10] aisleriot: update to 3.22.11

- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile
- Add yelp dep for viewing help info
---
 srcpkgs/aisleriot/template | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 40d46895aa4..c6294d9bc55 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,29 +1,19 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.9
+version=3.22.11
 revision=1
-_pysol_cardsets=PySolFC-Cardsets
-_pysol_ver=2.0
-build_style=gnu-configure
-configure_args="--with-platform=gtk-only
- --with-pysol-card-theme-path=${XBPS_BUILDDIR}/${_pysol_cardsets}-${_pysol_ver}"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config"
-makedepends="gc-devel guile-devel libcanberra-devel librsvg-devel
- libatomic_ops-devel"
-depends="aisleriot-data guile"
+wrksrc="${pkgname}-${version}-08104246822df8286d3f0d7b30b697d644ddc656"
+build_style=meson
+# build requires assertions to be turned on -> n_debug=false
+configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
+ -Dtheme_kde=false -Db_ndebug=false"
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
+ pysolfc-cardsets"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="guile3 yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
- http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
- c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
-
-aisleriot-data_package() {
-	short_desc+=" - data"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share
-	}
-}
+distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz"
+checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b

From f6e468f9f63e32f87485d5551bde88bf0e7b8e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:13:54 -0300
Subject: [PATCH 04/10] New package: scheme-bytestructures-1.0.7

Dependency for guile3-git
---
 srcpkgs/scheme-bytestructures/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/scheme-bytestructures/template

diff --git a/srcpkgs/scheme-bytestructures/template b/srcpkgs/scheme-bytestructures/template
new file mode 100644
index 00000000000..55da4ba01df
--- /dev/null
+++ b/srcpkgs/scheme-bytestructures/template
@@ -0,0 +1,23 @@
+# Template file for 'scheme-bytestructures'
+pkgname=scheme-bytestructures
+version=1.0.7
+revision=1
+build_style=gnu-configure
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="automake pkg-config guile3"
+makedepends="guile3-devel"
+depends=""
+short_desc="Structured access to bytevector contents"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/TaylanUB/scheme-bytestructures"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=cb5202289b0aa4fe470bf16a44b810631863afd48bf2677fd4bf53af017b52c8
+
+pre_configure() {
+	autoreconf -vfi
+}

From f1c8fab643dcc03bffef248dfabdf0cf88dc7801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:16:36 -0300
Subject: [PATCH 05/10] New package: guile-git-0.3.0

Dependency for guix.
---
 srcpkgs/guile-git/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-git/template

diff --git a/srcpkgs/guile-git/template b/srcpkgs/guile-git/template
new file mode 100644
index 00000000000..81282341ef2
--- /dev/null
+++ b/srcpkgs/guile-git/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-git'
+pkgname=guile-git
+version=0.3.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 texinfo"
+makedepends="libgit2-devel guile3-devel scheme-bytestructures"
+depends="scheme-bytestructures libgit2-devel"
+short_desc="Guile 3 bindings of libgit2"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/guile-git/guile-git"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=e12fc747cc817e60be07fea44126b077b292dbd1e96a5bee766754d5cc7e4a05
+
+pre_configure() {
+	autoreconf -vfi
+}

From 955f18cfbf5af07011ce6f035ffda16cf02b8966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:18:18 -0300
Subject: [PATCH 06/10] New package: guile-ssh-0.12.0

Dependency for guix.
---
 .../allow-build-with-guile-3.0-guild.patch    | 19 +++++++++++++++++++
 .../allow-build-with-guile-3.0-snarf.patch    | 17 +++++++++++++++++
 srcpkgs/guile-ssh/template                    | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
 create mode 100644 srcpkgs/guile-ssh/template

diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
new file mode 100644
index 00000000000..e47cee302fb
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 12:02:15.450830987 -0300
+--- configure.ac	2020-05-27 12:02:03.329824812 -0300
+***************
+*** 92,98 ****
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild`
+     AC_SUBST(GUILD)
+  fi
+  
+--- 92,98 ----
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild3`
+     AC_SUBST(GUILD)
+  fi
+  
diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
new file mode 100644
index 00000000000..b90ef05bdb0
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
@@ -0,0 +1,17 @@
+*** am/snarf	2020-01-05 13:19:18.000000000 -0300
+--- am/snarf	2020-05-27 12:02:42.774844905 -0300
+***************
+*** 1,6 ****
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
+--- 1,6 ----
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf3`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
diff --git a/srcpkgs/guile-ssh/template b/srcpkgs/guile-ssh/template
new file mode 100644
index 00000000000..9cf4a2ee39e
--- /dev/null
+++ b/srcpkgs/guile-ssh/template
@@ -0,0 +1,18 @@
+# Template file for 'guile-ssh'
+pkgname=guile-ssh
+version=0.12.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 libtool which texinfo"
+makedepends="guile3-devel libssh-devel"
+depends="libssh-devel"
+short_desc="SSH module for Guile based on libssh"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/artyom-poptsov/guile-ssh"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=d5b610fa0259187a824dfd26b11a415c1ca7b107912feea8b1a9e7c0fcfbe59c
+
+pre_configure() {
+	autoreconf -vfi
+}

From aee2b7e151ab416b6b79d8c59b7cc72be4f98c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:21:14 -0300
Subject: [PATCH 07/10] New package: guile-gcrypt-0.3.0

Dependency for guix.
---
 srcpkgs/guile-gcrypt/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-gcrypt/template

diff --git a/srcpkgs/guile-gcrypt/template b/srcpkgs/guile-gcrypt/template
new file mode 100644
index 00000000000..7210f5f50d4
--- /dev/null
+++ b/srcpkgs/guile-gcrypt/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-gcrypt'
+pkgname=guile-gcrypt
+version=0.3.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake guile3 pkg-config texinfo"
+makedepends="libgcrypt-devel guile3-devel"
+depends="libgcrypt-devel"
+short_desc="Guile 3 bindings for libgcrypt"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://notabug.org/cwebber/guile-gcrypt"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=07394c3de4f31a36ca2b670e1998c526de891d9436f12e94d8862ab081274d6a
+
+pre_configure() {
+	autoreconf -vfi
+}

From a45ae4fd4158e011e317fd0937c0f4cd66ea9fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:22:17 -0300
Subject: [PATCH 08/10] New package: guile-json

Dependency for guix.
---
 srcpkgs/guile-json/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/guile-json/template

diff --git a/srcpkgs/guile-json/template b/srcpkgs/guile-json/template
new file mode 100644
index 00000000000..3ec0e20650e
--- /dev/null
+++ b/srcpkgs/guile-json/template
@@ -0,0 +1,13 @@
+# Template file for 'guile-json'
+pkgname=guile-json
+version=3.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config guile3"
+makedepends="guile3-devel"
+short_desc="JSON module for Guile"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://savannah.nongnu.org/projects/guile-json/"
+distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=ceb7357308d75a9c49dabbddaecf60c9731eda3512b9275a79bb508f628c783d

From 2e8a52155d66224fa67aba6b6d8b729b9c70b518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:23:06 -0300
Subject: [PATCH 09/10] New package: guile-sqlite3

Dependency for guix.
---
 .../patches/allow-build-with-guile-3.0.patch  | 19 +++++++++++++++++++
 srcpkgs/guile-sqlite3/template                | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
 create mode 100644 srcpkgs/guile-sqlite3/template

diff --git a/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
new file mode 100644
index 00000000000..3196e9df051
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
@@ -0,0 +1,19 @@
+*** configure.old	2020-05-27 06:34:42.422898841 -0300
+--- configure.ac	2020-05-27 06:34:25.983868381 -0300
+***************
+*** 14,20 ****
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
+--- 14,20 ----
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([3.0 2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
diff --git a/srcpkgs/guile-sqlite3/template b/srcpkgs/guile-sqlite3/template
new file mode 100644
index 00000000000..abaa0c247b3
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-sqlite3'
+pkgname=guile-sqlite3
+version=0.1.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3"
+makedepends="sqlite-devel guile3-devel"
+depends="sqlite-devel"
+short_desc="Guile bindings to SQLite"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="LGPL-3.0-or-later"
+homepage="https://notabug.org/guile-sqlite3/guile-sqlite3"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7501cd60bc693e581dc3e153f418279e1e1637c0760bc4524af6eb2d8eac2fe9
+
+pre_configure() {
+	autoreconf -vfi
+}

From 1b1168d4444a2d543ffa620010508337bd971be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:25:50 -0300
Subject: [PATCH 10/10] New package: guix-1.1.0

---
 srcpkgs/guix/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/guix/template

diff --git a/srcpkgs/guix/template b/srcpkgs/guix/template
new file mode 100644
index 00000000000..d30a2cd8566
--- /dev/null
+++ b/srcpkgs/guix/template
@@ -0,0 +1,22 @@
+# Template file for 'guix'
+pkgname=guix
+version=1.1.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-bash-completion-dir=${DESTDIR}/usr/share/bash-completion/completions
+ --with-fish-completion-dir=${DESTDIR}/usr/share/fish/vendor_completions.d
+ --with-zsh-completion-dir=${DESTDIR}/usr/share/zsh/site_functions"
+hostmakedepends="guile3 pkg-config"
+_guile_libs="guile-git guile-json guile-sqlite3 guile-gcrypt guile-ssh"
+makedepends="gnutls gnutls-devel guile3-devel ${_guile_libs} zlib-devel"
+depends="guile3 ${_guile_libs}"
+short_desc="Package management tool for the GNU system"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://guix.gnu.org/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=5c59106ff4ac497c6097686834b0c914109cf5e44eb6b94ebce818923043640f
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	broken="Guix doesn't support musl"
+fi

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (4 preceding siblings ...)
  2020-05-28  0:32 ` [PR PATCH] [Updated] " ericonr
@ 2020-05-28  0:34 ` ericonr
  2020-05-28  0:41 ` [PR PATCH] [Updated] " ericonr
                   ` (16 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-05-28  0:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-635019075

Comment:
@travankor thanks! Will look into it.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (5 preceding siblings ...)
  2020-05-28  0:34 ` ericonr
@ 2020-05-28  0:41 ` ericonr
  2020-07-03 15:13 ` ericonr
                   ` (15 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-05-28  0:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages guile
https://github.com/void-linux/void-packages/pull/22359

[WIP] New packages: guile3, guix
Supersedes #22304 

- Added 3 as suffix for the guile3 executables.
- Update aisleriot, switch to guile3.
- Added dependencies for guix. I think there may be better ways of packaging them, but I'm not entirely sure. I have to fix the fact that they depend (for runtime) on the `-devel` version of other libraries, too.
- Package guix. Still needs a service file for `guix-daemon`.

A patch file from https://github.com/void-linux/void-packages/pull/22359.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22359.patch --]
[-- Type: text/x-diff, Size: 19545 bytes --]

From 6a4fa3b08b6435a6b5545a9451665567bce2002d Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 20:01:03 -0700
Subject: [PATCH 01/10] New package: guile3-3.0.2

---
 common/shlibs           |  2 ++
 srcpkgs/guile3-devel    |  1 +
 srcpkgs/guile3/template | 51 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3       |  1 +
 4 files changed, 55 insertions(+)
 create mode 120000 srcpkgs/guile3-devel
 create mode 100644 srcpkgs/guile3/template
 create mode 120000 srcpkgs/libguile3

diff --git a/common/shlibs b/common/shlibs
index 54a00e3150d..2d19f51176e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3958,3 +3958,5 @@ libvips.so.42 libvips-8.9.2_1
 libvips-cpp.so.42 libvips-8.9.2_1
 libselinux.so.1 libselinux-3.0_1
 libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..854ffb990b9
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+wrksrc=guile-${version}
+build_style=gnu-configure
+configure_args="--disable-static --disable-error-on-warning --program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	export GUILE_FOR_BUILD=guile3
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	# magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*) export CFLAGS+=" -Os";;
+	esac
+}
+
+libguile3_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel gc-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/share/aclocal
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file

From 3eca3abc1c3f24f2a901a853aa15913467ef0d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:02 -0300
Subject: [PATCH 02/10] gnutls: generate Guile 3.0 bindings

---
 srcpkgs/gnutls/patches/gnutls-guile3.patch | 19 +++++++++++++++++++
 srcpkgs/gnutls/template                    | 12 ++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gnutls/patches/gnutls-guile3.patch

diff --git a/srcpkgs/gnutls/patches/gnutls-guile3.patch b/srcpkgs/gnutls/patches/gnutls-guile3.patch
new file mode 100644
index 00000000000..745dc2cdc1d
--- /dev/null
+++ b/srcpkgs/gnutls/patches/gnutls-guile3.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 04:58:09.858735786 -0300
+--- configure.ac	2020-05-27 04:53:37.731383580 -0300
+***************
+*** 964,970 ****
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
+--- 964,970 ----
+  *** Detecting GNU Guile...
+  ])
+  
+!    AC_PATH_PROG([guile_snarf], [guile-snarf3])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 95bfab6a3f2..67e79f19eba 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,16 +1,17 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.13
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_if guile --enable-guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which
+ $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +20,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }

From 02b4250c0400e9e938334bcf37e51559f034df3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:12:30 -0300
Subject: [PATCH 03/10] aisleriot: update to 3.22.11

- Change build_style to meson
- Change distfile location
- Use pysol package instead of distfile
- Add yelp dep for viewing help info
---
 srcpkgs/aisleriot/template | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 40d46895aa4..c6294d9bc55 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,29 +1,19 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.9
+version=3.22.11
 revision=1
-_pysol_cardsets=PySolFC-Cardsets
-_pysol_ver=2.0
-build_style=gnu-configure
-configure_args="--with-platform=gtk-only
- --with-pysol-card-theme-path=${XBPS_BUILDDIR}/${_pysol_cardsets}-${_pysol_ver}"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config"
-makedepends="gc-devel guile-devel libcanberra-devel librsvg-devel
- libatomic_ops-devel"
-depends="aisleriot-data guile"
+wrksrc="${pkgname}-${version}-08104246822df8286d3f0d7b30b697d644ddc656"
+build_style=meson
+# build requires assertions to be turned on -> n_debug=false
+configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
+ -Dtheme_kde=false -Db_ndebug=false"
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
+ pysolfc-cardsets"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="guile3 yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
- http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
- c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
-
-aisleriot-data_package() {
-	short_desc+=" - data"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share
-	}
-}
+distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz"
+checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b

From 0559900a6e5cc90da3beaf882d5976017339a626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:13:54 -0300
Subject: [PATCH 04/10] New package: scheme-bytestructures-1.0.7

Dependency for guile3-git
---
 srcpkgs/scheme-bytestructures/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/scheme-bytestructures/template

diff --git a/srcpkgs/scheme-bytestructures/template b/srcpkgs/scheme-bytestructures/template
new file mode 100644
index 00000000000..e780625fb90
--- /dev/null
+++ b/srcpkgs/scheme-bytestructures/template
@@ -0,0 +1,17 @@
+# Template file for 'scheme-bytestructures'
+pkgname=scheme-bytestructures
+version=1.0.7
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3"
+makedepends="guile3-devel"
+short_desc="Structured access to bytevector contents"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/TaylanUB/scheme-bytestructures"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=cb5202289b0aa4fe470bf16a44b810631863afd48bf2677fd4bf53af017b52c8
+
+pre_configure() {
+	autoreconf -vfi
+}

From f60b4bb96847bc7b72774c3d0e1600a5efdc1521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:16:36 -0300
Subject: [PATCH 05/10] New package: guile-git-0.3.0

Dependency for guix.
---
 srcpkgs/guile-git/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-git/template

diff --git a/srcpkgs/guile-git/template b/srcpkgs/guile-git/template
new file mode 100644
index 00000000000..81282341ef2
--- /dev/null
+++ b/srcpkgs/guile-git/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-git'
+pkgname=guile-git
+version=0.3.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 texinfo"
+makedepends="libgit2-devel guile3-devel scheme-bytestructures"
+depends="scheme-bytestructures libgit2-devel"
+short_desc="Guile 3 bindings of libgit2"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/guile-git/guile-git"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=e12fc747cc817e60be07fea44126b077b292dbd1e96a5bee766754d5cc7e4a05
+
+pre_configure() {
+	autoreconf -vfi
+}

From 3891148ae4d965785f5758d25a19ccd1f2c01ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:18:18 -0300
Subject: [PATCH 06/10] New package: guile-ssh-0.12.0

Dependency for guix.
---
 .../allow-build-with-guile-3.0-guild.patch    | 19 +++++++++++++++++++
 .../allow-build-with-guile-3.0-snarf.patch    | 17 +++++++++++++++++
 srcpkgs/guile-ssh/template                    | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
 create mode 100644 srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
 create mode 100644 srcpkgs/guile-ssh/template

diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
new file mode 100644
index 00000000000..e47cee302fb
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch
@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 12:02:15.450830987 -0300
+--- configure.ac	2020-05-27 12:02:03.329824812 -0300
+***************
+*** 92,98 ****
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild`
+     AC_SUBST(GUILD)
+  fi
+  
+--- 92,98 ----
+  GUILE_SITE_DIR
+  
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild3`
+     AC_SUBST(GUILD)
+  fi
+  
diff --git a/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
new file mode 100644
index 00000000000..b90ef05bdb0
--- /dev/null
+++ b/srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch
@@ -0,0 +1,17 @@
+*** am/snarf	2020-01-05 13:19:18.000000000 -0300
+--- am/snarf	2020-05-27 12:02:42.774844905 -0300
+***************
+*** 1,6 ****
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
+--- 1,6 ----
+  # -*- makefile -*-
+  
+! GUILE_SNARF = `which guile-snarf3`
+  
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
diff --git a/srcpkgs/guile-ssh/template b/srcpkgs/guile-ssh/template
new file mode 100644
index 00000000000..9cf4a2ee39e
--- /dev/null
+++ b/srcpkgs/guile-ssh/template
@@ -0,0 +1,18 @@
+# Template file for 'guile-ssh'
+pkgname=guile-ssh
+version=0.12.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 libtool which texinfo"
+makedepends="guile3-devel libssh-devel"
+depends="libssh-devel"
+short_desc="SSH module for Guile based on libssh"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/artyom-poptsov/guile-ssh"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=d5b610fa0259187a824dfd26b11a415c1ca7b107912feea8b1a9e7c0fcfbe59c
+
+pre_configure() {
+	autoreconf -vfi
+}

From 36eaab36720072bc2edcd2d80a5841f934e3d1e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:21:14 -0300
Subject: [PATCH 07/10] New package: guile-gcrypt-0.3.0

Dependency for guix.
---
 srcpkgs/guile-gcrypt/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/guile-gcrypt/template

diff --git a/srcpkgs/guile-gcrypt/template b/srcpkgs/guile-gcrypt/template
new file mode 100644
index 00000000000..7210f5f50d4
--- /dev/null
+++ b/srcpkgs/guile-gcrypt/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-gcrypt'
+pkgname=guile-gcrypt
+version=0.3.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake guile3 pkg-config texinfo"
+makedepends="libgcrypt-devel guile3-devel"
+depends="libgcrypt-devel"
+short_desc="Guile 3 bindings for libgcrypt"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://notabug.org/cwebber/guile-gcrypt"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=07394c3de4f31a36ca2b670e1998c526de891d9436f12e94d8862ab081274d6a
+
+pre_configure() {
+	autoreconf -vfi
+}

From cf9cd440ea72864c0f3c1d1837ba1c60013f3752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:22:17 -0300
Subject: [PATCH 08/10] New package: guile-json

Dependency for guix.
---
 srcpkgs/guile-json/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/guile-json/template

diff --git a/srcpkgs/guile-json/template b/srcpkgs/guile-json/template
new file mode 100644
index 00000000000..3ec0e20650e
--- /dev/null
+++ b/srcpkgs/guile-json/template
@@ -0,0 +1,13 @@
+# Template file for 'guile-json'
+pkgname=guile-json
+version=3.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config guile3"
+makedepends="guile3-devel"
+short_desc="JSON module for Guile"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://savannah.nongnu.org/projects/guile-json/"
+distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=ceb7357308d75a9c49dabbddaecf60c9731eda3512b9275a79bb508f628c783d

From e04c1c57389ead2dfd4928a32ba9226c713eca2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:23:06 -0300
Subject: [PATCH 09/10] New package: guile-sqlite3

Dependency for guix.
---
 .../patches/allow-build-with-guile-3.0.patch  | 19 +++++++++++++++++++
 srcpkgs/guile-sqlite3/template                | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
 create mode 100644 srcpkgs/guile-sqlite3/template

diff --git a/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
new file mode 100644
index 00000000000..3196e9df051
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch
@@ -0,0 +1,19 @@
+*** configure.old	2020-05-27 06:34:42.422898841 -0300
+--- configure.ac	2020-05-27 06:34:25.983868381 -0300
+***************
+*** 14,20 ****
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
+--- 14,20 ----
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+  
+! GUILE_PKG([3.0 2.2 2.0])
+  GUILE_PROGS
+  
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
diff --git a/srcpkgs/guile-sqlite3/template b/srcpkgs/guile-sqlite3/template
new file mode 100644
index 00000000000..abaa0c247b3
--- /dev/null
+++ b/srcpkgs/guile-sqlite3/template
@@ -0,0 +1,19 @@
+# Template file for 'guile-sqlite3'
+pkgname=guile-sqlite3
+version=0.1.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3"
+makedepends="sqlite-devel guile3-devel"
+depends="sqlite-devel"
+short_desc="Guile bindings to SQLite"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="LGPL-3.0-or-later"
+homepage="https://notabug.org/guile-sqlite3/guile-sqlite3"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7501cd60bc693e581dc3e153f418279e1e1637c0760bc4524af6eb2d8eac2fe9
+
+pre_configure() {
+	autoreconf -vfi
+}

From 240070e16b0e391d684cf0dd6c13942125a11c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 27 May 2020 14:25:50 -0300
Subject: [PATCH 10/10] New package: guix-1.1.0

---
 srcpkgs/guix/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/guix/template

diff --git a/srcpkgs/guix/template b/srcpkgs/guix/template
new file mode 100644
index 00000000000..d30a2cd8566
--- /dev/null
+++ b/srcpkgs/guix/template
@@ -0,0 +1,22 @@
+# Template file for 'guix'
+pkgname=guix
+version=1.1.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-bash-completion-dir=${DESTDIR}/usr/share/bash-completion/completions
+ --with-fish-completion-dir=${DESTDIR}/usr/share/fish/vendor_completions.d
+ --with-zsh-completion-dir=${DESTDIR}/usr/share/zsh/site_functions"
+hostmakedepends="guile3 pkg-config"
+_guile_libs="guile-git guile-json guile-sqlite3 guile-gcrypt guile-ssh"
+makedepends="gnutls gnutls-devel guile3-devel ${_guile_libs} zlib-devel"
+depends="guile3 ${_guile_libs}"
+short_desc="Package management tool for the GNU system"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://guix.gnu.org/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=5c59106ff4ac497c6097686834b0c914109cf5e44eb6b94ebce818923043640f
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	broken="Guix doesn't support musl"
+fi

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (6 preceding siblings ...)
  2020-05-28  0:41 ` [PR PATCH] [Updated] " ericonr
@ 2020-07-03 15:13 ` ericonr
  2020-08-03 22:14 ` ericonr
                   ` (14 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-07-03 15:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-653591252

Comment:
I haven't managed to make it work yet :/

The trick might have helped a bit, though, because it seems to be erroring out in a different place.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (7 preceding siblings ...)
  2020-07-03 15:13 ` ericonr
@ 2020-08-03 22:14 ` ericonr
  2020-08-03 22:31 ` anjandev
                   ` (13 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-08-03 22:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 377 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-668267483

Comment:
@anjandev if you'd like to take my guile3 commits from this PR, feel free to do so. I don't see myself completing this package, since I've now switched full time to musl. @travankor if you'd like to take this over, that's an option too.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (8 preceding siblings ...)
  2020-08-03 22:14 ` ericonr
@ 2020-08-03 22:31 ` anjandev
  2020-08-13 19:05 ` [PR PATCH] [Closed]: " ericonr
                   ` (12 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: anjandev @ 2020-08-03 22:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New comment by anjandev on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-668273190

Comment:

Érico Nogueira Rolim <notifications@github.com> writes:

> @anjandev if you'd like to take my guile3 commits from this PR, feel free to do so.

I really dont have a use for this package and will not be
maintaining it.


^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Closed]: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (9 preceding siblings ...)
  2020-08-03 22:31 ` anjandev
@ 2020-08-13 19:05 ` ericonr
  2020-08-14  2:43 ` travankor
                   ` (11 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-08-13 19:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 551 bytes --]

There's a closed pull request on the void-packages repository

[WIP] New packages: guile3, guix
https://github.com/void-linux/void-packages/pull/22359

Description:
Supersedes #22304 

- Added 3 as suffix for the guile3 executables.
- Update aisleriot, switch to guile3.
- Added dependencies for guix. I think there may be better ways of packaging them, but I'm not entirely sure. I have to fix the fact that they depend (for runtime) on the `-devel` version of other libraries, too.
- Package guix. Still needs a service file for `guix-daemon`.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (10 preceding siblings ...)
  2020-08-13 19:05 ` [PR PATCH] [Closed]: " ericonr
@ 2020-08-14  2:43 ` travankor
  2020-08-14  3:07 ` ericonr
                   ` (10 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: travankor @ 2020-08-14  2:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-673852398

Comment:
It would be neat if guile3 could work with musl, but I don't have the time unfortunately.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (11 preceding siblings ...)
  2020-08-14  2:43 ` travankor
@ 2020-08-14  3:07 ` ericonr
  2020-08-15  2:40 ` travankor
                   ` (9 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-08-14  3:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-673857803

Comment:
@travankor guile3 itself is working under musl. If you'd like to make a PR with the guile3 commit, it's working for everything. It's Guix that doesn't work on musl.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (12 preceding siblings ...)
  2020-08-14  3:07 ` ericonr
@ 2020-08-15  2:40 ` travankor
  2020-08-15  2:57 ` ericonr
                   ` (8 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: travankor @ 2020-08-15  2:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-674336979

Comment:
@ericonr Interesting that guile3 works fine on musl, while guix does not. Do you know the reason why guix is broken under musl and if this can be fixed? My understanding was that guix was written entirely in guile, so if guile works, then all application written in guile should work.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (13 preceding siblings ...)
  2020-08-15  2:40 ` travankor
@ 2020-08-15  2:57 ` ericonr
  2020-08-15  2:57 ` ericonr
                   ` (7 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-08-15  2:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-674338671

Comment:
Not sure :/ 

I believe `guix` simply doesn't know about musl as a target, so it couldn't get a proper configuration for itself. Since guix seems to want some glibc features such as `nss`, iiuc, I didn't try to go too deep into configuring the whole thing.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (14 preceding siblings ...)
  2020-08-15  2:57 ` ericonr
@ 2020-08-15  2:57 ` ericonr
  2020-08-15  2:57 ` ericonr
                   ` (6 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-08-15  2:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-674338671

Comment:
Not sure :/ 

I believe `guix` simply doesn't know about musl as a target, so it couldn't get a proper configuration for itself. Since guix also seems to want some glibc features such as `nss`, iiuc, I didn't try to go too deep into configuring the whole thing.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (15 preceding siblings ...)
  2020-08-15  2:57 ` ericonr
@ 2020-08-15  2:57 ` ericonr
  2020-10-13 18:32 ` ev-ermakov
                   ` (5 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ericonr @ 2020-08-15  2:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-674338671

Comment:
Not sure :/ 

I believe `guix` simply doesn't know about musl as a target, so it couldn't get a proper configuration for itself. Since guix also seems to want / recommend some glibc features such as `nss`, iiuc, I didn't try to go too deep into configuring the whole thing.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (16 preceding siblings ...)
  2020-08-15  2:57 ` ericonr
@ 2020-10-13 18:32 ` ev-ermakov
  2020-10-14  5:25 ` travankor
                   ` (4 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ev-ermakov @ 2020-10-13 18:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 344 bytes --]

New comment by ev-ermakov on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-707930476

Comment:
@ericonr, @travankor
> It's Guix that doesn't work on musl

Are you sure? :)

![screenshot](https://user-images.githubusercontent.com/22344340/95901064-4fc2ad00-0d82-11eb-81d1-ad815e9b0db8.png)


^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (17 preceding siblings ...)
  2020-10-13 18:32 ` ev-ermakov
@ 2020-10-14  5:25 ` travankor
  2020-10-14  6:22 ` ev-ermakov
                   ` (3 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: travankor @ 2020-10-14  5:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-708164770

Comment:
@ev-ermakov 

Nice! Did you install this from a Void template or from the generic shell installer maintained by the Guix community? This is on my todo list to investigate, but I don't have much time right now :/ 

If you have a custom template for this, then it would be nice to upstream it to the void-packages repository :)

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (18 preceding siblings ...)
  2020-10-14  5:25 ` travankor
@ 2020-10-14  6:22 ` ev-ermakov
  2020-10-14  6:26 ` ev-ermakov
                   ` (2 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ev-ermakov @ 2020-10-14  6:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]

New comment by ev-ermakov on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-708185992

Comment:
@travankor 
I compiled everything from scratch (without using xbps-src), following the [installation instructions](https://guix.gnu.org/manual/en/html_node/Requirements.html).

Here's the patch:
```diff
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -262,6 +262,7 @@
   "Return the name of Glibc's dynamic linker for SYSTEM."
   ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc.
   (cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2")
+        ((string=? system "x86_64-linux-musl") "/lib/ld-musl-x86_64.so.1")
         ((string=? system "i686-linux") "/lib/ld-linux.so.2")
         ((string=? system "armhf-linux") "/lib/ld-linux-armhf.so.3")
         ((string=? system "mips64el-linux") "/lib/ld.so.1")
```
But, of course, this is not enough:
![screenshot](https://user-images.githubusercontent.com/22344340/95950897-e4f68d80-0de4-11eb-8dab-e92db6ce0c42.png)


^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (19 preceding siblings ...)
  2020-10-14  6:22 ` ev-ermakov
@ 2020-10-14  6:26 ` ev-ermakov
  2020-10-14  6:26 ` ev-ermakov
  2020-10-14  6:43 ` ev-ermakov
  22 siblings, 0 replies; 24+ messages in thread
From: ev-ermakov @ 2020-10-14  6:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1316 bytes --]

New comment by ev-ermakov on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-708185992

Comment:
@travankor 
I compiled everything from scratch (without using xbps-src), following the [installation instructions](https://guix.gnu.org/manual/en/html_node/Requirements.html).

Here's the patch:
```diff
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -262,6 +262,7 @@
   "Return the name of Glibc's dynamic linker for SYSTEM."
   ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc.
   (cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2")
+        ((string=? system "x86_64-linux-musl") "/lib/ld-musl-x86_64.so.1")
         ((string=? system "i686-linux") "/lib/ld-linux.so.2")
         ((string=? system "armhf-linux") "/lib/ld-linux-armhf.so.3")
         ((string=? system "mips64el-linux") "/lib/ld.so.1")
```
But, of course, this is not enough:
![screenshot](https://user-images.githubusercontent.com/22344340/95950897-e4f68d80-0de4-11eb-8dab-e92db6ce0c42.png)

Required packages:
```
bytestructures-1.0.7.tar.gz  guile-git-0.3.0.tar.gz     guile-ssh-0.13.1.tar.gz
guile-3.0.4.tar.gz           guile-json-3.5.0.tar.gz    guix-1.1.0.tar.gz
guile-gcrypt-0.3.0.tar.gz    guile-sqlite-0.1.3.tar.gz
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (20 preceding siblings ...)
  2020-10-14  6:26 ` ev-ermakov
@ 2020-10-14  6:26 ` ev-ermakov
  2020-10-14  6:43 ` ev-ermakov
  22 siblings, 0 replies; 24+ messages in thread
From: ev-ermakov @ 2020-10-14  6:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1320 bytes --]

New comment by ev-ermakov on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-708185992

Comment:
@travankor 
I compiled everything from scratch (without using xbps-src), following the [installation instructions](https://guix.gnu.org/manual/en/html_node/Requirements.html).

Here's the patch:
```diff
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -262,6 +262,7 @@
   "Return the name of Glibc's dynamic linker for SYSTEM."
   ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc.
   (cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2")
+        ((string=? system "x86_64-linux-musl") "/lib/ld-musl-x86_64.so.1")
         ((string=? system "i686-linux") "/lib/ld-linux.so.2")
         ((string=? system "armhf-linux") "/lib/ld-linux-armhf.so.3")
         ((string=? system "mips64el-linux") "/lib/ld.so.1")
```
But, of course, this is not enough:
![screenshot](https://user-images.githubusercontent.com/22344340/95950897-e4f68d80-0de4-11eb-8dab-e92db6ce0c42.png)

--
Required packages:
```
bytestructures-1.0.7.tar.gz  guile-git-0.3.0.tar.gz     guile-ssh-0.13.1.tar.gz
guile-3.0.4.tar.gz           guile-json-3.5.0.tar.gz    guix-1.1.0.tar.gz
guile-gcrypt-0.3.0.tar.gz    guile-sqlite-0.1.3.tar.gz
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [WIP] New packages: guile3, guix
  2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
                   ` (21 preceding siblings ...)
  2020-10-14  6:26 ` ev-ermakov
@ 2020-10-14  6:43 ` ev-ermakov
  22 siblings, 0 replies; 24+ messages in thread
From: ev-ermakov @ 2020-10-14  6:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1321 bytes --]

New comment by ev-ermakov on void-packages repository

https://github.com/void-linux/void-packages/pull/22359#issuecomment-708185992

Comment:
@travankor 
I compiled everything from scratch (without using xbps-src), following the [installation instructions](https://guix.gnu.org/manual/en/html_node/Requirements.html).

Here's the patch:
```diff
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -262,6 +262,7 @@
   "Return the name of Glibc's dynamic linker for SYSTEM."
   ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc.
   (cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2")
+        ((string=? system "x86_64-linux-musl") "/lib/ld-musl-x86_64.so.1")
         ((string=? system "i686-linux") "/lib/ld-linux.so.2")
         ((string=? system "armhf-linux") "/lib/ld-linux-armhf.so.3")
         ((string=? system "mips64el-linux") "/lib/ld.so.1")
```
But, of course, this is not enough:
![screenshot](https://user-images.githubusercontent.com/22344340/95950897-e4f68d80-0de4-11eb-8dab-e92db6ce0c42.png)

--
Required packages:
```
bytestructures-1.0.7.tar.gz  guile-git-0.3.0.tar.gz     guile-ssh-0.13.1.tar.gz
guile-3.0.4.tar.gz           guile-json-3.5.0.tar.gz    guix-1.1.0.tar.gz
guile-gcrypt-0.3.0.tar.gz    guile-sqlite3-0.1.3.tar.gz
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2020-10-14  6:43 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-27 17:35 [PR PATCH] [WIP] New packages: guile3, guix ericonr
2020-05-27 17:36 ` [PR PATCH] [Updated] " ericonr
2020-05-27 17:38 ` ericonr
2020-05-27 18:32 ` ericonr
2020-05-27 21:04 ` travankor
2020-05-28  0:32 ` [PR PATCH] [Updated] " ericonr
2020-05-28  0:34 ` ericonr
2020-05-28  0:41 ` [PR PATCH] [Updated] " ericonr
2020-07-03 15:13 ` ericonr
2020-08-03 22:14 ` ericonr
2020-08-03 22:31 ` anjandev
2020-08-13 19:05 ` [PR PATCH] [Closed]: " ericonr
2020-08-14  2:43 ` travankor
2020-08-14  3:07 ` ericonr
2020-08-15  2:40 ` travankor
2020-08-15  2:57 ` ericonr
2020-08-15  2:57 ` ericonr
2020-08-15  2:57 ` ericonr
2020-10-13 18:32 ` ev-ermakov
2020-10-14  5:25 ` travankor
2020-10-14  6:22 ` ev-ermakov
2020-10-14  6:26 ` ev-ermakov
2020-10-14  6:26 ` ev-ermakov
2020-10-14  6:43 ` ev-ermakov

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).