From patchwork Tue Jan 15 08:11:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gabriel Hondet X-Patchwork-Id: 743 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 2FD6616A23; Tue, 15 Jan 2019 08:12:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6DA7F169ED for ; Tue, 15 Jan 2019 08:12:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:44438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjJpQ-0005lM-D9 for patchwork@mira.cbaines.net; Tue, 15 Jan 2019 03:12:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjJpM-0005kO-Qz for guix-patches@gnu.org; Tue, 15 Jan 2019 03:12:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjJpK-00051F-FG for guix-patches@gnu.org; Tue, 15 Jan 2019 03:12:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60228) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gjJpK-00050z-AN for guix-patches@gnu.org; Tue, 15 Jan 2019 03:12:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gjJpJ-0007o4-Pu for guix-patches@gnu.org; Tue, 15 Jan 2019 03:12:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33920] [PATCH] gnu: Add gauche. Resent-From: Gabriel Hondet Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Jan 2019 08:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33920 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 33920-submit@debbugs.gnu.org id=B33920.154753988029956 (code B ref 33920); Tue, 15 Jan 2019 08:12:01 +0000 Received: (at 33920) by debbugs.gnu.org; 15 Jan 2019 08:11:20 +0000 Received: from localhost ([127.0.0.1]:59509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjJoe-0007n6-E9 for submit@debbugs.gnu.org; Tue, 15 Jan 2019 03:11:20 -0500 Received: from mail-wr1-f44.google.com ([209.85.221.44]:35439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjJoc-0007mt-MM for 33920@debbugs.gnu.org; Tue, 15 Jan 2019 03:11:19 -0500 Received: by mail-wr1-f44.google.com with SMTP id 96so1846469wrb.2 for <33920@debbugs.gnu.org>; Tue, 15 Jan 2019 00:11:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=p3WIs4o4YZ6EmaY14deSSSf0K0EQDVdX2jdr80bWobk=; b=F93KQkx1VJuZLZSTF/9zx+xSDMa+85YDni6vy02ANEYCNR29WfmnZU+S/5wPf2GzSO MjqZsps5gzaQx7wWk7i/Nf8TSm9CT0AGzV2a/4j/OBOoS9o8CjM+q5fx0eEJWQNl7y+l evYgg99z8hNdsa5pxMTVx8GVNlFB8ZNPrYNS4I8R8uhgmMMMaQ3bfljblLmWQZdP2gQb p6scXg+RQ0iPPkrVzsDDF9i/5YYg7v7Ejt++7LK9sxRm0J2y29f2q9v3yHSzVT8pFRCv QuZH+65BO/B8E1FKrO5PbEXvL6iVjU2Q/hFBgpyYQZcM7fUK4XjhNHQh1dXTAScEiYsf 38Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=p3WIs4o4YZ6EmaY14deSSSf0K0EQDVdX2jdr80bWobk=; b=gE7hlFhyouoDUB3ROY5+fBfsCyj/S13dadj2ADxiZlX7OkbBlds1EZFZbhBtYlLuQ7 n1Ghu+MycE91gI+hJE54/T6+Xt2Q1jpi5BPEKapkpEfBncKn7RJx9HWuaPS1DMtJcZdW 7xmicz7YITwf1PIsPthY07+LpLt+XlmrI61BTLhZbg2naxJkBd6wTFOEHcEOVV5ePRQm Fv2DcHdzJxShIiwEW7SlTstiWFBwjXiLsh57dOikhW18CFvKRnJ+nSOLSdvlZlzBox5T kJjWK1Fei+nPSLg/pg5lLwgZtI0R9vcTi5KRu7ZD1mzrL5l1iDK4f/K5Q8tfdNgfsNPV Lzag== X-Gm-Message-State: AJcUukfJfEIIZ4E+obmFDO3sM149d146Py9kCL5DayM/KgOx+X2RLdgY bYuOLEtK4V4WUxZTKgBJ879te2JT X-Google-Smtp-Source: ALg8bN5Q9mahADD/dIV5HIA8f7M79m1VPku70bAddbtzSI1cP3/pbU90UP8+DSOESk2HliPfRmJ43w== X-Received: by 2002:a05:6000:11c3:: with SMTP id i3mr2007592wrx.221.1547539872620; Tue, 15 Jan 2019 00:11:12 -0800 (PST) Received: from glht-x240.gmail.com ([217.109.134.89]) by smtp.gmail.com with ESMTPSA id v6sm24536901wrd.88.2019.01.15.00.11.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Jan 2019 00:11:11 -0800 (PST) References: <875zvbjvxv.fsf@gmail.com> <8709180406da2b2eabffd1b4397a2bf3@riseup.net> <87muof8pyk.fsf@gmail.com> <87sgy14yg2.fsf@gnu.org> <87o98m8961.fsf@gmail.com> <87k1j847h0.fsf@gnu.org> User-agent: mu4e 1.0; emacs 26.1 From: Gabriel Hondet In-reply-to: <87k1j847h0.fsf@gnu.org> Date: Tue, 15 Jan 2019 09:11:10 +0100 Message-ID: <87ef9ee3xd.fsf@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 33920@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/scheme.scm (gauche): New variable. --- gnu/packages/scheme.scm | 82 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) On Sun 13 Jan 2019 at 21:40 Ludovic Courtès wrote: > Out of curiosity, do these tests rely on specific host name lookups or > external services? Regarding net tests, it seems they only involve localhost. > As swedebugia noted, Gauche uses libgc and libatomic-ops. Could you > try to add these two libraries as inputs and to adjust the package to > make sure it does not use the bundled copies? The use of the internal libatomic_ops has been disabled, but on the other hand, I don't see where libgc is used (is it the full gc thing?), or at least it seems it can't be disabled via configure scripts. Gabriel diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 16904dce3..3836f3a3e 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Adam Massmann +;;; Copyright © 2018 Gabriel Hondet ;;; ;;; This file is part of GNU Guix. ;;; @@ -1164,3 +1165,84 @@ simple, elegant Scheme dialect. It is a lisp-1 with lexical scope. The core is 12 builtin special forms and 33 builtin functions.") (home-page "https://github.com/JeffBezanson/femtolisp") (license bsd-3)))) + +(define-public gauche + (package + (name "gauche") + (version "0.9.7") + (home-page "http://practical-scheme.net/gauche/index.html") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/gauche/Gauche/Gauche-" + version ".tgz")) + (sha256 + (base32 + "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove libatomic-ops + (delete-file-recursively "gc/libatomic_ops") + #t)))) + (build-system gnu-build-system) + (inputs + `(("libatomic-ops" ,libatomic-ops) + ("zlib" ,zlib))) + (native-inputs + `(("texinfo" ,texinfo) + ("openssl" ,openssl) ; needed for tests + ("pkg-config" ,pkg-config))) ; needed to find external libatomic-ops + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh + ;; needed only for tests + (lambda _ + (substitute* '("configure" + "test/www.scm" + "ext/tls/test.scm" + "gc/configure" + "lib/gauche/configure.scm" + "lib/gauche/package/util.scm" + "lib/gauche/process.scm") + (("/bin/sh") (which "sh"))) + #t)) + (add-after 'build 'build-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (with-directory-excursion "doc" + (for-each + (lambda (target) + (invoke "make" target)) + '("info" "html" "htmls")))) + #t)) + (add-before 'check 'patch-normalize-test + ;; neutralize sys-normalize-pathname test as it relies on + ;; the home directory; (setenv "HOME" xx) isn't enough) + (lambda _ + (substitute* "test/system.scm" + (("~/abc") "//abc")) + #t)) + (add-before 'check 'patch-network-tests + ;; remove net checks + (lambda _ + (substitute* "ext/Makefile" + (("binary net termios") "binary termios")) + #t)) + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (with-directory-excursion "doc" + (invoke "make" "install"))) + #t))))) + (synopsis "Scheme scripting engine") + (description "Gauche is a R7RS Scheme scripting engine aiming at being a +handy tool that helps programmers and system administrators to write small to +large scripts quickly. Quick startup, built-in system interface, native +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. There are currently 58 packages +available.") + (license bsd-3))) -- 2.20.1