From patchwork Fri Jun 19 13:35:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Edouard Klein X-Patchwork-Id: 22779 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 BCF4127BBE3; Fri, 19 Jun 2020 14:36:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D5E6E27BBE1 for ; Fri, 19 Jun 2020 14:36:09 +0100 (BST) Received: from localhost ([::1]:46336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmHBh-0000kI-Cc for patchwork@mira.cbaines.net; Fri, 19 Jun 2020 09:36:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmHBa-0000jF-K6 for guix-patches@gnu.org; Fri, 19 Jun 2020 09:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmHBa-0006QJ-AB for guix-patches@gnu.org; Fri, 19 Jun 2020 09:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmHBa-0000G0-6f for guix-patches@gnu.org; Fri, 19 Jun 2020 09:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41949] [PATCH 1/5] gnu: Add gerbil References: <875zbn2o5i.fsf@alice.lan> In-Reply-To: <875zbn2o5i.fsf@alice.lan> Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jun 2020 13:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41949 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41949@debbugs.gnu.org Received: via spool by 41949-submit@debbugs.gnu.org id=B41949.1592573747959 (code B ref 41949); Fri, 19 Jun 2020 13:36:02 +0000 Received: (at 41949) by debbugs.gnu.org; 19 Jun 2020 13:35:47 +0000 Received: from localhost ([127.0.0.1]:55442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHBK-0000FP-M2 for submit@debbugs.gnu.org; Fri, 19 Jun 2020 09:35:47 -0400 Received: from sender4-op-o11.zoho.com ([136.143.188.11]:17124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHBI-0000FG-OD for 41949@debbugs.gnu.org; Fri, 19 Jun 2020 09:35:45 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1592573741; cv=none; d=zohomail.com; s=zohoarc; b=fRbcRk8/ihwGzeyMe7AsMZb98tpFPJjEInBV6vrZ24RiMS4s9ArN6zQ7RgiyU1i5PHE38+Ulo/d6f6YOaKT4Hg0rzLtT6vJsMpe1njcU9DAI78K+LPygdb57bDsyySNyrqwnIJL6fV/RjtfCGtuYWTtd851IR0WgESZPE5WAhRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592573741; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=2PwQPZ/rVsOcIdwD2K+tbVricNK38vscSxxVmYz66eY=; b=MyGf0jKv2IaOODnr7hyFCC6w8r1iov9LQJm0562cSyUUYKHXb8JCAeGn8e6l4oGLbZWUqLGlI59NWPohP2/OKgYzXhvqzM1jyZT88zC+cgIqBJQeLUlcEQvZRFNq0V+kcrVjVq9hsHqXVBNybTpm+VnkmlCWN9Y9zyUnjWZP90Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=beaver-labs.com; spf=pass smtp.mailfrom=edk@beaver-labs.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1592573741; s=zoho; d=beaver-labs.com; i=edk@beaver-labs.com; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=2PwQPZ/rVsOcIdwD2K+tbVricNK38vscSxxVmYz66eY=; b=Sv3nMIaZ6YPTFbB1mVba+K7/pCGTQvfSUCNHtNuU3JgMr7vB/UIGIaoNT4PoIh1q YKLdY4gUOZxAc3OTnmXq0CGpRAZowAOkfpq4K/f7BjXTx8nzfha/cBEwnYseVwFiso3 z6OvZkx+WXSJxZw0ORBwEQkivB2iVouFEpuLKAEA= Received: from alice.lan (lfbn-idf1-1-1299-119.w90-79.abo.wanadoo.fr [90.79.23.119]) by mx.zohomail.com with SMTPS id 1592573740317946.8949582234115; Fri, 19 Jun 2020 06:35:40 -0700 (PDT) User-agent: mu4e 1.4.6; emacs 26.3 From: Edouard Klein Message-ID: <87366r2n6n.fsf@alice.lan> Date: Fri, 19 Jun 2020 15:35:29 +0200 MIME-Version: 1.0 X-ZohoMailClient: External 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 * gnu/packages/scheme.scm: (gerbil): New variable. --- gnu/packages/scheme.scm | 108 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 4551e57d4a..4ceabb1996 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2018 Gabriel Hondet ;;; Copyright © 2020 Pierre Neidhardt +;;; Copyright © 2020 Edouard Klein ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,7 +32,7 @@ (define-module (gnu packages scheme) #:use-module (gnu packages) #:use-module ((guix licenses) - #:select (gpl2+ lgpl2.0+ lgpl2.1+ lgpl3+ asl2.0 bsd-3 + #:select (gpl2+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ asl2.0 bsd-3 cc-by-sa4.0 non-copyleft expat)) #:use-module (guix packages) #:use-module (guix download) @@ -70,6 +71,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages gl) #:use-module (gnu packages libedit) + #:use-module (gnu packages linux) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -1076,3 +1078,107 @@ multilingual support are some of the goals. Gauche comes with a package manager/installer @code{gauche-package} which can download, compile, install and list gauche extension packages.") (license bsd-3))) + +(define-public gerbil + (package + (name "gerbil") + (version "0.16") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vyzo/gerbil.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vng0kxpnwsg8jbjdpyn4sdww36jz7zfpfbzayg9sdpz6bjxjy0f")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (add-before 'configure 'chdir + (lambda _ + (chdir "src") + #t)) + (replace 'configure + (lambda* (#:key outputs inputs #:allow-other-keys) + (invoke "chmod" "755" "-R" ".") + ;; Otherwise fails when editing an r--r--r-- file. + (invoke "gsi-script" "configure" + "--prefix" (assoc-ref outputs "out") + "--with-gambit" (assoc-ref inputs "gambit-c")))) + (add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs + (lambda _ + ;; Some .ss files refer to gxi using /usr/bin/env gxi + ;; and 'patch-generated-file-shebangs can't fix that + ;; because gxi has not been compiled yet. + ;; We know where gxi is going to end up so we + ;; Doctor Who our fix here before the problem + ;; happens towards the end of the build.sh script. + (let ((abs-srcdir (getcwd))) + (for-each + (lambda (f) + (substitute* f + (("#!/usr/bin/env gxi") + (string-append "#!" abs-srcdir "/../bin/gxi")))) + '("./gerbil/gxc" + "./lang/build.ss" + "./misc/http-perf/build.ss" + "./misc/rpc-perf/build.ss" + "./misc/scripts/docsnarf.ss" + "./misc/scripts/docstub.ss" + "./misc/scripts/docsyms.ss" + "./r7rs-large/build.ss" + "./release.ss" + "./std/build.ss" + "./std/run-tests.ss" + "./std/web/fastcgi-test.ss" + "./std/web/rack-test.ss" + "./tools/build.ss" + "./tutorial/httpd/build.ss" + "./tutorial/kvstore/build.ss" + "./tutorial/lang/build.ss" + "./tutorial/proxy/build-static.ss" + "./tutorial/proxy/build.ss"))) + #t)) + (replace + 'build + (lambda* + (#:key inputs #:allow-other-keys) + (setenv "HOME" (getcwd)) + (invoke + ;; The build script needs a tty or it'll crash on an ioctl + ;; trying to find the width of the terminal it's running on. + ;; Calling in script prevents that. + "script" + "-qefc" + "./build.sh"))) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib"))) + (mkdir-p bin) + (mkdir-p lib) + (copy-recursively "../bin" bin) + (copy-recursively "../lib" lib))))))) + (native-inputs + `(("coreutils" ,coreutils) + ("util-linux" ,util-linux))) + (propagated-inputs + `(("gambit-c" ,gambit-c) + ("zlib" ,zlib) + ("openssl" ,openssl) + ("sqlite" ,sqlite))) + (build-system gnu-build-system) + (synopsis "Meta-dialect of Scheme with post-modern features") + (description "Gerbil is an opinionated dialect of Scheme designed for Systems +Programming, with a state of the art macro and module system on top of the Gambit +runtime. The macro system is based on quote-syntax, and provides the full meta-syntactic +tower with a native implementation of syntax-case. It also provides a full-blown module +system, similar to PLT Scheme's (sorry, Racket) modules. The main difference from Racket +is that Gerbil modules are single instantiation, supporting high performance ahead of +time compilation and compiled macros.") + (home-page "https://cons.io") + (license `(,lgpl2.1 ,asl2.0)))) From patchwork Fri Jun 19 13:36:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Edouard Klein X-Patchwork-Id: 22782 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 C731D27BBE3; Fri, 19 Jun 2020 14:39:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 79B2927BBE1 for ; Fri, 19 Jun 2020 14:39:39 +0100 (BST) Received: from localhost ([::1]:56368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmHF5-0005h7-2M for patchwork@mira.cbaines.net; Fri, 19 Jun 2020 09:39:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmHCY-0001Uu-2n for guix-patches@gnu.org; Fri, 19 Jun 2020 09:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmHCX-0006cR-PP for guix-patches@gnu.org; Fri, 19 Jun 2020 09:37:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmHCX-0000I1-Mm for guix-patches@gnu.org; Fri, 19 Jun 2020 09:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41949] [PATCH 2/5] gnu: Add xlsxio References: <875zbn2o5i.fsf@alice.lan> In-Reply-To: <875zbn2o5i.fsf@alice.lan> Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jun 2020 13:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41949 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41949@debbugs.gnu.org Received: via spool by 41949-submit@debbugs.gnu.org id=B41949.15925737721030 (code B ref 41949); Fri, 19 Jun 2020 13:37:01 +0000 Received: (at 41949) by debbugs.gnu.org; 19 Jun 2020 13:36:12 +0000 Received: from localhost ([127.0.0.1]:55446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHBk-0000GY-3v for submit@debbugs.gnu.org; Fri, 19 Jun 2020 09:36:12 -0400 Received: from sender4-op-o11.zoho.com ([136.143.188.11]:17128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHBg-0000GM-3o for 41949@debbugs.gnu.org; Fri, 19 Jun 2020 09:36:10 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1592573765; cv=none; d=zohomail.com; s=zohoarc; b=YAnBaH6vVaWvzSSKAoafE0r4kCSm679Ij3ikXiyqpGQQ8UwQHxaxr68SN0lcsuZB+FONCvs4zZu58BqZbxTxqyH+G014zaZDclZlqzWkemZXFfVZSVuBCkYWWi4CdJN0wFKILNpxumJgDtnWpMZND/0MLKVE2PnJdiMWxt+Uvek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592573765; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=tz7rVkqttt16LmTue12GBM+e1oZfNLc0AW2ZHpNg6Tk=; b=KENumH1D3qyU2cJHJOkyB/Ov5j8uDou6XYOo9llDyepy6QG+m/WOy89UUCDORDOrZZSX5Yp6TZTRrJSeuWytmsjeZ2OHgnryFinBJh+rnjep1fJ+5Y9f7EANDjq0+ftsmBm7LBq99Gm4XF54vDZIkPiJnrkrtsV53tBaYPnv8dc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=beaver-labs.com; spf=pass smtp.mailfrom=edk@beaver-labs.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1592573765; s=zoho; d=beaver-labs.com; i=edk@beaver-labs.com; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=tz7rVkqttt16LmTue12GBM+e1oZfNLc0AW2ZHpNg6Tk=; b=HJr+A9J7OUeI2TelRgkWTViBNCDFcidliIhsvfzNudC3hlMVzUC2yfjAcdQnoAgv S4HbH7unyOIGXgVe4GJv9RSy5xn+4DB63Sg4oCUlskOLqIvsl56ROStHh7ZDMu1DpyN 4zBCr9OGIvX8lGl2lGum8fh031k7ZoU6fuA7p7V4= Received: from alice.lan (lfbn-idf1-1-1299-119.w90-79.abo.wanadoo.fr [90.79.23.119]) by mx.zohomail.com with SMTPS id 1592573764194593.5042426936827; Fri, 19 Jun 2020 06:36:04 -0700 (PDT) User-agent: mu4e 1.4.6; emacs 26.3 From: Edouard Klein Message-ID: <87zh8z18lb.fsf@alice.lan> Date: Fri, 19 Jun 2020 15:36:00 +0200 MIME-Version: 1.0 X-ZohoMailClient: External 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 * gnu/packages/xml.scm: (xlsxio): New variable. --- gnu/packages/xml.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 90181a1773..2246a5fab2 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2018 Jack Hill ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Paul Garlick +;;; Copyright © 2020 Edouard Klein ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ (define-module (gnu packages xml) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages autotools) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -1312,6 +1314,42 @@ generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.") (license license:asl2.0))) +(define-public xlsxio + (package + (name "xlsxio") + (version "0.2.26") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/brechtsanders/xlsxio.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0j8jral3yc2aib2ykp527lyb62a1d9p7qmfbszy7iy3s65pkma9b")))) + (native-inputs + `(("expat" ,expat) + ("make" ,gnu-make) + ("minizip" ,minizip) + ("which" ,which))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "install" + (string-append + "PREFIX=" (assoc-ref outputs "out")))))))) + (synopsis "C library for reading and writing .xlsx files") + (description "XLSX I/O aims to provide a C library for reading and writing +.xlsx files. The .xlsx file format is the native format used by Microsoft(R) +Excel(TM) since version 2007.") + (home-page "https://github.com/brechtsanders/xlsxio") + (license license:expat))) + (define-public java-simple-xml (package (name "java-simple-xml") From patchwork Fri Jun 19 13:36:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Edouard Klein X-Patchwork-Id: 22780 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 22F7127BBE3; Fri, 19 Jun 2020 14:37:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5065527BBE1 for ; Fri, 19 Jun 2020 14:37:11 +0100 (BST) Received: from localhost ([::1]:48154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmHCg-0001X3-SF for patchwork@mira.cbaines.net; Fri, 19 Jun 2020 09:37:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmHCY-0001VW-G0 for guix-patches@gnu.org; Fri, 19 Jun 2020 09:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmHCY-0006cY-68 for guix-patches@gnu.org; Fri, 19 Jun 2020 09:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmHCY-0000I9-3t for guix-patches@gnu.org; Fri, 19 Jun 2020 09:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41949] [PATCH 3/5] guix: Add gerbil-build-system References: <875zbn2o5i.fsf@alice.lan> In-Reply-To: <875zbn2o5i.fsf@alice.lan> Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jun 2020 13:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41949 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41949@debbugs.gnu.org Received: via spool by 41949-submit@debbugs.gnu.org id=B41949.15925737941067 (code B ref 41949); Fri, 19 Jun 2020 13:37:02 +0000 Received: (at 41949) by debbugs.gnu.org; 19 Jun 2020 13:36:34 +0000 Received: from localhost ([127.0.0.1]:55449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHC5-0000H8-EM for submit@debbugs.gnu.org; Fri, 19 Jun 2020 09:36:33 -0400 Received: from sender4-op-o11.zoho.com ([136.143.188.11]:17131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHC3-0000Gz-Bl for 41949@debbugs.gnu.org; Fri, 19 Jun 2020 09:36:32 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1592573788; cv=none; d=zohomail.com; s=zohoarc; b=X+MmEuesCb4kqUYgpNcQ8rcpEgsNs2D8MtoTyA2iuT2p3uEFmL2dMRXfeIgFpR4wQqgu/gB90s37whLxIyOYfwPaO4LnZjwIroCP6kUVGosvmdoVYRiwbHD+tvKU3lnYgckA67hC6xzcX8H07AoCjW3SeHg1tYKRsL2IBg0p970= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592573788; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=aVrQLLbpbnJ8eLff7y9O4br9VFcO+gyWDm8PjHZAqZ4=; b=JIaC5lREPW/yM5dcOIICJNcHhItgzrZt08ScuI9L1pT9AgWL24BNlRP1AwJIGGHz2dMeSrc7HxZa71JMRUZ8/nzoAhH/Ewr3YSV7Te29nDwzJAyLvbMjmiI9tUsEZ/ckBkLEEkj2LPfgPtxDl2G+RvVbb7EDWXHzomra9f9rn/Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=beaver-labs.com; spf=pass smtp.mailfrom=edk@beaver-labs.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1592573788; s=zoho; d=beaver-labs.com; i=edk@beaver-labs.com; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=aVrQLLbpbnJ8eLff7y9O4br9VFcO+gyWDm8PjHZAqZ4=; b=bXpinrr97B6570eNzd4h+9nVB0KFYfDKUqa9HHSoPSr8/9sqWawps8MNHMPvpxI8 kJhUl7U8b0lCb03+EV/LweCooa6oYHckEgak7ukJGr62+FTcSMdCAGPa2Lb4MKSV93h XMT7CHjnDAOmLjOZn0pXqhUBv0fC2j6XDaWrmk/Q= Received: from alice.lan (lfbn-idf1-1-1299-119.w90-79.abo.wanadoo.fr [90.79.23.119]) by mx.zohomail.com with SMTPS id 1592573787941652.1032957369371; Fri, 19 Jun 2020 06:36:27 -0700 (PDT) User-agent: mu4e 1.4.6; emacs 26.3 From: Edouard Klein Message-ID: <87wo4318kn.fsf@alice.lan> Date: Fri, 19 Jun 2020 15:36:24 +0200 MIME-Version: 1.0 X-ZohoMailClient: External 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 * guix/build-system/gerbil.scm: New file. (%gerbil-build-system-modules): New variable. (gerbil-build): New variable (gerbil-build-system): New variable * guix/build/gerbil-build-system.scm: New file. (%standard-phases): New variable. (gerbil-build): New variable. --- guix/build-system/gerbil.scm | 119 +++++++++++++++++++++++++++++ guix/build/gerbil-build-system.scm | 102 +++++++++++++++++++++++++ 2 files changed, 221 insertions(+) create mode 100644 guix/build-system/gerbil.scm create mode 100644 guix/build/gerbil-build-system.scm diff --git a/guix/build-system/gerbil.scm b/guix/build-system/gerbil.scm new file mode 100644 index 0000000000..eea0261b2a --- /dev/null +++ b/guix/build-system/gerbil.scm @@ -0,0 +1,119 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Edouard Klein +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system gerbil) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix derivations) + #:use-module (guix search-paths) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) + #:use-module (guix packages) + #:use-module (ice-9 match) + #:export (%gerbil-build-system-modules + gerbil-build + gerbil-build-system)) + +(define %gerbil-build-system-modules + ;; Build-side modules imported by default. + `((guix build gerbil-build-system) + ,@%gnu-build-system-modules)) + +(define (default-gerbil) + "Return the default Gerbil package." + ;; Do not use `@' to avoid introducing circular dependencies. + (let ((module (resolve-interface '(gnu packages scheme)))) + (module-ref module 'gerbil))) + +(define* (lower name + #:key source inputs native-inputs outputs system target + (gerbil (default-gerbil)) + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME." + (define private-keywords + '(#:source #:target #:inputs #:native-inputs)) + (bag + (name name) + (system system) + (target target) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@inputs + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) + (build-inputs `(("gerbil" ,gerbil) + ,@native-inputs)) + (outputs outputs) + (build gerbil-build) + (arguments (strip-keyword-arguments private-keywords arguments)))) + +(define* (gerbil-build store name inputs + #:key + (phases '(@ (guix build gerbil-build-system) + %standard-phases)) + (outputs '("out")) + (search-paths '()) + (system (%current-system)) + (guile #f) + (imported-modules %gerbil-build-system-modules) + (modules '((guix build gerbil-build-system) + (guix build utils)))) + "Build SOURCE using GERBIL and with INPUTS." + (define builder + `(begin + (use-modules ,@modules) + (gerbil-build #:name ,name + #:source ,(match (assoc-ref inputs "source") + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:system ,system + #:phases ,phases + #:outputs %outputs + #:search-paths ',(map search-path-specification->sexp + search-paths) + #:inputs %build-inputs))) + + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system #:graft? #f)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages commencement))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system #:graft? #f))))) + + (build-expression->derivation store name builder + #:inputs inputs + #:system system + #:modules imported-modules + #:outputs outputs + #:guile-for-build guile-for-build)) + +(define gerbil-build-system + (build-system + (name 'gerbil) + (description "The standard Gerbil build system") + (lower lower))) + +;;; gerbil.scm ends here diff --git a/guix/build/gerbil-build-system.scm b/guix/build/gerbil-build-system.scm new file mode 100644 index 0000000000..e6763b841a --- /dev/null +++ b/guix/build/gerbil-build-system.scm @@ -0,0 +1,102 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Edouard Klein +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build gerbil-build-system) + #:use-module ((guix build gnu-build-system) #:prefix gnu:) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:use-module (ice-9 ftw) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:export (%standard-phases + gerbil-build)) + +;; Gerbil's build system and package management is documented at +;; https://cons.io/guide/package-manager.html +;; https://cons.io/guide/build.html +;; https://cons.io/guide/env-vars.html +;; +;; The compiler is writing its output in the directory +;; pointed to by GERBIL_PATH (or ~/.gerbil by default). +;; +;; Every package is supposed to have a build.ss script +;; whose default action (when called with no argument) +;; is to compile the package. +;; +;; The GERBIL_LOADPATH env variable tells gerbil's runtime +;; where it can find its loadable code. +;; +;; GERBIL_HOME tells gerbil where to find its runtime +;; and standard library +;; +;; This build system therefore just +;; - makes GERBIL_PATH point to the output directory in the store, +;; - makes GERBIL_LOADPATH point to the lib subdir +;; of all the gerbil inputs, +;; - calls ./build.ss, +;; - wrap any executable with GERBIL_LOADPATH set the the lib +;; subdir of all the gerbil inputs plus the lib subdir +;; of the current package's output, and with GERBIL_HOME +;; set to the lib directory of the 'gerbil' input + +(define (loadpath inputs) + (string-join (map (match-lambda + ((_ . path) + (string-append path "/lib"))) + ;; Restrict to inputs beginning with "gerbil-". + (filter (match-lambda + ((name . _) + (string-prefix? "gerbil-" name))) + inputs)) + ":")) + +(define (gerbil-home inputs) + (assoc-ref inputs "gerbil")) + +(define* (install #:key inputs outputs #:allow-other-keys) + "Install a given Gerbil package." + (let ((out (assoc-ref outputs "out")) + (in (loadpath inputs))) + (setenv "GERBIL_PATH" out) + (setenv "GERBIL_LOADPATH" in) + (invoke "./build.ss")) + #t) + +(define* (wrap #:key inputs outputs #:allow-other-keys) + "Wrap any executable with a proper GERBIL_LOADPATH and GERBIL_HOME" + (let* ((out (assoc-ref outputs "out")) + (in (loadpath inputs)) + (gerbil-loadpath (string-append out "/lib:" in))) + (for-each (cut wrap-program <> + `("GERBIL_LOADPATH" = (,gerbil-loadpath)) + `("GERBIL_HOME" = (,(gerbil-home inputs)))) + (find-files (string-append out "/bin"))))) + +(define %standard-phases + (modify-phases gnu:%standard-phases + (delete 'bootstrap) + (delete 'configure) ;not needed + (delete 'build) ;build.ss does both build and install + (delete 'check) ;no standard way of testing + (replace 'install install) + (add-after 'install 'wrap wrap))) + +(define* (gerbil-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + "Build the given Gerbil package, applying all of PHASES in order." + (apply gnu:gnu-build #:inputs inputs #:phases phases args)) From patchwork Fri Jun 19 13:36:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edouard Klein X-Patchwork-Id: 22783 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 EF26E27BBE3; Fri, 19 Jun 2020 14:39:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AFEF727BBE1 for ; Fri, 19 Jun 2020 14:39:44 +0100 (BST) Received: from localhost ([::1]:56596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmHFA-0005tg-9W for patchwork@mira.cbaines.net; Fri, 19 Jun 2020 09:39:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmHCY-0001W4-TG for guix-patches@gnu.org; Fri, 19 Jun 2020 09:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmHCY-0006cg-JX for guix-patches@gnu.org; Fri, 19 Jun 2020 09:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmHCY-0000IG-Gl for guix-patches@gnu.org; Fri, 19 Jun 2020 09:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41949] [PATCH 4/5] gnu: Add gerbil-srfi-54 References: <875zbn2o5i.fsf@alice.lan> In-Reply-To: <875zbn2o5i.fsf@alice.lan> Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jun 2020 13:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41949 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41949@debbugs.gnu.org Received: via spool by 41949-submit@debbugs.gnu.org id=B41949.15925738171103 (code B ref 41949); Fri, 19 Jun 2020 13:37:02 +0000 Received: (at 41949) by debbugs.gnu.org; 19 Jun 2020 13:36:57 +0000 Received: from localhost ([127.0.0.1]:55452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHCS-0000Hi-W8 for submit@debbugs.gnu.org; Fri, 19 Jun 2020 09:36:57 -0400 Received: from sender4-op-o11.zoho.com ([136.143.188.11]:17140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHCR-0000Ha-8x for 41949@debbugs.gnu.org; Fri, 19 Jun 2020 09:36:55 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1592573813; cv=none; d=zohomail.com; s=zohoarc; b=cYP0WIa4UL1IUXvwlFtEHX+6aK1k8e494kQPg5KOWZbIdq/0PcFNtQJzROn3wcsWZAPeP66pCIrKbIvRnqs0rG+3ZS6R75QMIQX/l4QaIPq0MrDgLoGBJGK4gAeOcA5uc8cRgeapwtF1R2BCRdgUpyrGYlNLQ7eI5tACdG2/Kto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592573813; h=Content-Type:Date:From:MIME-Version:Message-ID:Subject:To; bh=R9BQRRuzHexZ+z+KXQHEm+04zn0EhaNEa8rJESWXtvs=; b=VjNQJK2UgBDm/7SBGUTDfL5A7kh0AdJm3rR1p0BNEhc74547AxGPEdh5mk87F9we4C8rgikCTLQ0Dn6LF3VW7CJhALsmTiRKtK6pXTtczFnQbXveGz44WyMHLtkQyAVXXwpv4TWuJBlLyMSYBCC+tHfFFRFS2XONj1spGe+m7ao= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=beaver-labs.com; spf=pass smtp.mailfrom=edk@beaver-labs.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1592573813; s=zoho; d=beaver-labs.com; i=edk@beaver-labs.com; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type; bh=R9BQRRuzHexZ+z+KXQHEm+04zn0EhaNEa8rJESWXtvs=; b=FkTpiPnNzA3Z8SmtERCamon5gYn80xwQpe6kcE6fp9DgNp0DRZrohWQPsq5dv/SJ gwkYwTIMChgJtqTJ+F+XMPNf6afotNjbuNZGxzowGMOYn4U+m8BSfZQaaxxiGsNpPdB /pkojvKlFxqWgXHNcv8TSiiqdNk2HB7ZwGigS8dQ= Received: from alice.lan (lfbn-idf1-1-1299-119.w90-79.abo.wanadoo.fr [90.79.23.119]) by mx.zohomail.com with SMTPS id 1592573811840960.416925106682; Fri, 19 Jun 2020 06:36:51 -0700 (PDT) User-agent: mu4e 1.4.6; emacs 26.3 From: Edouard Klein Message-ID: <87tuz718jz.fsf@alice.lan> Date: Fri, 19 Jun 2020 15:36:48 +0200 MIME-Version: 1.0 X-ZohoMailClient: External 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 * gnu/packages/scheme-xyz.scm: New File (gerbil-srfi-54): New variable. --- gnu/packages/scheme-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 gnu/packages/scheme-xyz.scm diff --git a/gnu/packages/scheme-xyz.scm b/gnu/packages/scheme-xyz.scm new file mode 100644 index 0000000000..8b553848ee --- /dev/null +++ b/gnu/packages/scheme-xyz.scm @@ -0,0 +1,28 @@ +(define-module (gnu packages scheme-xyz) + #:use-module (guix packages) + #:use-module (guix build-system gerbil) + #:use-module (gnu packages scheme) + #:use-module (gnu packages xml) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public gerbil-srfi-54 + (package + (name "gerbil-srfi-54") + (version "git") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hckiang/srfi-54") + (commit "master"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k1ddfhvbmf9njxm1ybs61n9kpzjvha2j63mf756r7b3x5rk51b0")))) + (build-system gerbil-build-system) + (synopsis "SRFI-54 for Gerbil Scheme") + (description "This SRFI introduces the CAT procedure that converts any object +to a string. It takes one object as the first argument and accepts a variable +number of optional arguments, unlike the procedure called FORMAT.") + (home-page "https://github.com/hckiang/srfi-54") + (license license:lgpl3))) From patchwork Fri Jun 19 13:37:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edouard Klein X-Patchwork-Id: 22781 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 E3B8127BBE1; Fri, 19 Jun 2020 14:38:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9B06D27BBE4 for ; Fri, 19 Jun 2020 14:38:11 +0100 (BST) Received: from localhost ([::1]:51610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmHDf-0002xq-4q for patchwork@mira.cbaines.net; Fri, 19 Jun 2020 09:38:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmHDW-0002sm-C5 for guix-patches@gnu.org; Fri, 19 Jun 2020 09:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmHDW-0006ib-1q for guix-patches@gnu.org; Fri, 19 Jun 2020 09:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmHDV-0000Jv-VL for guix-patches@gnu.org; Fri, 19 Jun 2020 09:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41949] [PATCH 5/5] gnu: Add gerbil-denatting References: <875zbn2o5i.fsf@alice.lan> In-Reply-To: <875zbn2o5i.fsf@alice.lan> Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jun 2020 13:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41949 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41949@debbugs.gnu.org Received: via spool by 41949-submit@debbugs.gnu.org id=B41949.15925738571197 (code B ref 41949); Fri, 19 Jun 2020 13:38:01 +0000 Received: (at 41949) by debbugs.gnu.org; 19 Jun 2020 13:37:37 +0000 Received: from localhost ([127.0.0.1]:55458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHD7-0000JE-9h for submit@debbugs.gnu.org; Fri, 19 Jun 2020 09:37:37 -0400 Received: from sender4-op-o11.zoho.com ([136.143.188.11]:17151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmHD5-0000J6-F8 for 41949@debbugs.gnu.org; Fri, 19 Jun 2020 09:37:36 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1592573853; cv=none; d=zohomail.com; s=zohoarc; b=feqXsLjBPLROdRLKTmyjIIQxamkoLzi/z1j2CtASfnjN3nMWju6JLa+D+uXv+TojycPSxiPMaffHLy+45sABSJ/Wl2N5tXNZdhoheTHwmsKwiYC1/6bVF+4VJS4QKzz7J/sctUrgpdBiqdYeqCgwb3ebJtYzaPZhjat8xemOV4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592573853; h=Content-Type:Date:From:MIME-Version:Message-ID:Subject:To; bh=feJlwaIjKrBPTOhA/sW7QlNiTfJ/L5w4I06ONmvU0co=; b=EHvWT88Un2ekeB1ZugoiY57XTq4lHo5d/i5Dolrfsi942V3QTqOwRYFguulYehaJEIvfH0o0p3Vdd1uZkzdC54zzrInSkf9m8NqNjfShOqSI5wDzDhsrwzlq0biBjURKlgWc1/jvvRiJPUd1IkVderI4XRkRrr+d/k/h9UlkkU8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=beaver-labs.com; spf=pass smtp.mailfrom=edk@beaver-labs.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1592573853; s=zoho; d=beaver-labs.com; i=edk@beaver-labs.com; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type; bh=feJlwaIjKrBPTOhA/sW7QlNiTfJ/L5w4I06ONmvU0co=; b=St6/tWCL4fHRtfvaZ56Qg2E7D45zSTvxmCmWVwgMN2zmoFPAfNFRL0+cGZuqS7dR G7SnrIIwdkZruB4KhVpr2prM3tFEEsOLYfu10C9xQdHKZQQYx07k5SYUaZ0scPfto3w O+UZzl0DWuDOVqFZhmqRxUJlTw6gLLyNVLthHr90= Received: from alice.lan (lfbn-idf1-1-1299-119.w90-79.abo.wanadoo.fr [90.79.23.119]) by mx.zohomail.com with SMTPS id 1592573852565962.7031510993095; Fri, 19 Jun 2020 06:37:32 -0700 (PDT) User-agent: mu4e 1.4.6; emacs 26.3 From: Edouard Klein Message-ID: <87r1ub18iu.fsf@alice.lan> Date: Fri, 19 Jun 2020 15:37:29 +0200 MIME-Version: 1.0 X-ZohoMailClient: External 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 * gnu/packages/scheme-xyz.scm: (gerbil-denatting): New variable. --- gnu/packages/scheme-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/scheme-xyz.scm b/gnu/packages/scheme-xyz.scm index 8b553848ee..39991c5807 100644 --- a/gnu/packages/scheme-xyz.scm +++ b/gnu/packages/scheme-xyz.scm @@ -26,3 +26,37 @@ to a string. It takes one object as the first argument and accepts a variable number of optional arguments, unlike the procedure called FORMAT.") (home-page "https://github.com/hckiang/srfi-54") (license license:lgpl3))) + +(define-public gerbil-denatting + (package + (name "gerbil-denatting") + (version "0.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/edouardklein/denatting.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m8nlqjs1bqhs7cqdf9ddj9hnm9xfmngzd5iawc0fz3qamsw1wyp")))) + (propagated-inputs + `(("gerbil" ,gerbil) + ("xlsxio" ,xlsxio) + ("gerbil-srfi-54" ,gerbil-srfi-54))) + (build-system gerbil-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'wrap 'rewrap ;Allow denat to find xlsxio's shared object + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((denat (string-append (assoc-ref outputs "out") "/bin/denat")) + (xlsxio (string-append (assoc-ref inputs "xlsxio") "/lib"))) + (wrap-program denat `("LD_LIBRARY_PATH" = (,xlsxio))))))))) + (synopsis "Find who is hiding behind a mobile IPv4") + (description "Denatting is a Europol-backed project whose goal is to allow +investigators in participating countries to discover which Internet Service Provider +(ISP) client is responsible for a set of network events as reported by content +providers within the legal framework of a judicial investigation.") + (home-page "https://gitlab.com/edouardklein/denatting") + (license license:agpl3+)))