From patchwork Fri Feb 4 11:47:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 36989 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7D32527BBEA; Fri, 4 Feb 2022 11:48:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 15B7427BBE9 for ; Fri, 4 Feb 2022 11:48:19 +0000 (GMT) Received: from localhost ([::1]:45974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFx4c-0007HJ-4q for patchwork@mira.cbaines.net; Fri, 04 Feb 2022 06:48:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFx4M-0007Gq-Qr for guix-patches@gnu.org; Fri, 04 Feb 2022 06:48:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFx4M-0003ZZ-HS for guix-patches@gnu.org; Fri, 04 Feb 2022 06:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nFx4L-0000oA-US; Fri, 04 Feb 2022 06:48:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53775] [PATCH] gnu: Add gnunet-scheme Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: pukkamustard@posteo.net, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Fri, 04 Feb 2022 11:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53775 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53775@debbugs.gnu.org Cc: pukkamustard , pukkamustard X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: pukkamustard , pukkamustard Received: via spool by submit@debbugs.gnu.org id=B.16439752653008 (code B ref -1); Fri, 04 Feb 2022 11:48:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2022 11:47:45 +0000 Received: from localhost ([127.0.0.1]:58918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFx3x-0000lf-6T for submit@debbugs.gnu.org; Fri, 04 Feb 2022 06:47:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:48052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFx3v-0000lV-8T for submit@debbugs.gnu.org; Fri, 04 Feb 2022 06:47:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFx3u-0007Ey-T0 for guix-patches@gnu.org; Fri, 04 Feb 2022 06:47:35 -0500 Received: from [2a02:1800:110:4::f00:19] (port=52976 helo=laurent.telenet-ops.be) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFx3n-0003Vq-U1 for guix-patches@gnu.org; Fri, 04 Feb 2022 06:47:34 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by laurent.telenet-ops.be with bizsmtp id qznQ260034UW6Th01znQus; Fri, 04 Feb 2022 12:47:24 +0100 Message-ID: <33b610635cb8cf1edab0cd0efa285c078216fd03.camel@telenet.be> From: Maxime Devos Date: Fri, 04 Feb 2022 12:47:17 +0100 User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1643975244; bh=A8tsnCFNhRO96gpjjJN+KVimPRwrmsU3DchZCTrC8qI=; h=Subject:From:To:Date; b=dqGAwzWTTjAtWsgEmiPEyEjjo+tJdEJlDlFTG5gfvIsJhOY6Jg7pngU4pZ1amK87c TKdDqZipi4NKqQ5MeHqN2/AGAwwZN5Ii4jkzXIlMZxv77oZXUqa9QrskFV34VGC8Hm QQG0cRr7kBgXxquazYE5todR+RSwxQx4hxhLqHQ01Kgj/Jz3iCPf/AiRUbeiU1x80p L1EbLyTA0ptxenODfA8k9RET1vOJZCiQympS3LREC9zna1UkX+PnaBQuJpAKF+V/HY c99Nv1HOsa0Gq/vUd/tNgthxD6CYbBtC5Hl7wE6biOC1cn7ImiFFjZBEWEJsJOPS/V noKIzW8oZFNjA== X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a02:1800:110:4::f00:19 (failed) Received-SPF: pass client-ip=2a02:1800:110:4::f00:19; envelope-from=maximedevos@telenet.be; helo=laurent.telenet-ops.be X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches X-Debbugs-CC: pukkamustard , pukkamustard [CC'ing pukkamustard and ludo for their interest in Guix+GNUnet] Hi, The first patch adds a module to guile-fibers required by gnunet-scheme. It has been submitted upstream at , but there has not been any response so far. The second commit adds 'gnunet-scheme', which is not the same as guile-gnunet: "This package provides Guile modules for connecting to the NSE (network size estimation) and DHT (distributed hash table) services of GNUnet. It also has infrastructure for writing new GNUnet services and connecting to them and can be used from multi-threaded environments. It is not to be confused with @code{guile-gnunet} -- @code{guile-gnunet} supports a different set of services." gnunet-scheme supports the DHT and NSE, while guile-gnunet doesn't. Conversely, guile-gnunet supports FS while gnunet-scheme doesn't (yet). Additionally, while it's not impossible per se, guile-gnunet is hard to use from a multi-threaded context. Next step: integrate it with guile-eris and the substituter patches based on guile-eris (currently these only support IPFS as P2P backend)! 'guix lint gnunet-scheme guile-fibers' only have a single complaint: gnu/packages/gnunet.scm:379:12: gnunet-scheme@0.2: URI https://git.gnunet.org/git/gnunet-scheme.git not reachable: 404 ("Not Found") "guix build gnunet-scheme" could download the source code though, so I don't understand. It fails to cross-compile because guile-fibers fails to cross-compile: > checking for guile-3.0... yes > checking for guile-3.0... no > checking for guile3.0... no > checking for guile-3... no > checking for guile3... no > checking for guile... no > configure: error: guile required but not found That's unrelated to gnunet-scheme though. Greetings, Maxime From 5b57cdbb8f4d56c66885ea029cbe0a185d61a725 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Fri, 4 Feb 2022 11:23:36 +0000 Subject: [PATCH 2/2] gnu: Add gnunet-scheme. This is not the same as guile-gnunet, see the description. * gnu/packages/gnunet.scm (gnunet-scheme): New variable. --- gnu/packages/gnunet.scm | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 5c0dd348cc..1c09c9047b 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ (define-module (gnu packages gnunet) #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages libidn) #:use-module (gnu packages linux) @@ -58,10 +60,12 @@ (define-module (gnu packages gnunet) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) + #:use-module (gnu packages text-editors) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) #:use-module (gnu packages video) #:use-module (gnu packages vim) + #:use-module (gnu packages xorg) #:use-module (gnu packages web) #:use-module (gnu packages xiph) #:use-module (gnu packages backup) @@ -368,6 +372,60 @@ (define-public guile-gnunet ;GSoC 2015! (home-page "https://gnu.org/software/guix") (license license:gpl3+)))) +(define-public gnunet-scheme + (package + (name "gnunet-scheme") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.gnunet.org/git/gnunet-scheme.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0a11n58m346vs2khns2hfnxv8lbscf8aaqzhmq0d7nwdpn808nrp")) + (modules '((guix build utils))) + ;; XXX: Work-around + ;; , + ;; this can be removed once Guile > 3.0.7 is released. + (snippet '(substitute* '("gnu/gnunet/config/parser.scm" + "tests/config-parser.scm") + (("#\\{\\$\\{\\}\\}#") "#{${;};}#") + (("#\\{\\$\\{:-\\}\\}#") "#{${;:-};}#") + (("#\\{\\$\\{\\}\\}# #\\{\\$\\{:-\\}\\}#") + "#{$\\x7b;\\x7d;}# #{$\\x7b;:-\\x7d;}#") + (("'#\\{\\$\\{\\}\\}# '#\\{\\$\\{:-\\}\\}#") + "'#{$\\x7b;\\x7d;}# '#{$\\x7b;:-\\x7d;}#"))))) + (build-system gnu-build-system) + (inputs (list guile-3.0)) ;for pkg-config + (propagated-inputs (list guile-bytestructures guile-gcrypt guile-pfds + guile-fibers-1.1)) + (native-inputs (list guile-3.0 ;as a compiler + ;; for cross-compilation, the guile inputs need to be + ;; native-inputs as well. + guile-bytestructures + guile-gcrypt + guile-pfds + guile-fibers-1.1 + automake + autoconf + pkg-config + texmacs + xvfb-run ;for documentation + guile-quickcheck)) ;for tests + (synopsis "Guile implementation of GNUnet client libraries") + (description + "This package provides Guile modules for connecting to the NSE (network +size estimation) and DHT (distributed hash table) services of GNUnet. It also +has infrastructure for writing new GNUnet services and connecting to them and +can be used from multi-threaded environments. It is not to be confused with +@code{guile-gnunet} -- @code{guile-gnunet} supports a different set of services.") + ;; Most code is licensed as AGPL and a few modules are licensed as LGPL + ;; or GPL. Documentation is licensed as GFDL. + (license (list license:agpl3+ license:gpl3+ license:fdl1.3+ license:lgpl3+)) + (home-page "https://git.gnunet.org/gnunet-scheme.git"))) + ;; FIXME: "gnunet-setup" segfaults under certain conditions and "gnunet-gtk" ;; does not seem to be fully functional. This has been reported upstream: ;; http://lists.gnu.org/archive/html/gnunet-developers/2016-02/msg00004.html -- 2.34.0