From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id wIA3IwoVA2VxnwAA9RJhRA:P1 (envelope-from ) for ; Thu, 14 Sep 2023 16:13:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id wIA3IwoVA2VxnwAA9RJhRA (envelope-from ) for ; Thu, 14 Sep 2023 16:13:30 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 54B66318CF for ; Thu, 14 Sep 2023 16:13:30 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=P8iFvT3P; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1694700810; a=rsa-sha256; cv=none; b=ikBmsPOtIVeO/C1GPye0dITURSaqguV28HC+9Bq8km0pdUBOn6BuusRatTEE4NG8O+LHJb NOAYP0MDjznwCAvImFQqRbizymBjFs9huuz5CPDmsLwP5OWipeSF1R2Cs4PM8rCaM7u9OB AtKlIW2b0u8Y3cfRp2PD+zeAL8lcOOwlTcCagBqzoXwTsr93PcKfzHrkmV0r1k53KxlvVc cd+Js+7bbwMYvcCgPp+e8wpnDxpR0tlTvnjpTivgQiwa0PnRb+eXS/2q72S3KxmwF/MJht Iev3yrDdpm/7a9C4NZofVwlbttj5QCZorCsJvAeMsh7U5Xfo8ltEn8nf5zSGNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1694700810; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=OzTLohWIgQGSrGftIfb86pKV9kHKUC9AJTZR5fvrxS4=; b=CVXtJVdB4jlv1Xfr/k1866Oi92UzHNf6FCq204gjUxU3J5ZEBB54r+qnOhAHVRupzOfvg3 mxtzV5WFYcpMW1Vim9OlpcmEXr9Mj0AAP8+7e4zpZvv07yu6hnEk+gNajE7KnakaXLiZOR 5yF+SShUGKYHVIrMyAX8yyWq+VvjFbrgZcQHm3fv7KaCmCS9POEPmCcZ1xNuZEj8jK4c8M Rtmmlj9/r0xUI5ZKmbo4Cis1Wm9UrsW2vYTMafC9Wl7yPE5g+1cAeOKl2V+rUyh63qDuBV Xaf3YYH/8D2BvWbp4FP+7SCQ+wqjvfIdISSaRyKk/dXEVl/Zwg7pFKppTgHUww== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=P8iFvT3P; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgn5Z-0001Gx-IS; Thu, 14 Sep 2023 10:13:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgn5V-0001A1-Db for guix-patches@gnu.org; Thu, 14 Sep 2023 10:12:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgn5V-0003Qx-5j for guix-patches@gnu.org; Thu, 14 Sep 2023 10:12:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qgn5a-0007WY-Ka for guix-patches@gnu.org; Thu, 14 Sep 2023 10:13:02 -0400 Subject: bug#65494: [PATCH] gnu: Add stklos. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 14 Sep 2023 14:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 65494 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ramin Honary Cc: 65494-done@debbugs.gnu.org Mail-Followup-To: 65494@debbugs.gnu.org, ludo@gnu.org, ramin.honary@gmail.com Received: via spool by 65494-done@debbugs.gnu.org id=D65494.169470075628868 (code D ref 65494); Thu, 14 Sep 2023 14:13:02 +0000 Received: (at 65494-done) by debbugs.gnu.org; 14 Sep 2023 14:12:36 +0000 Received: from localhost ([127.0.0.1]:40707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgn5A-0007VX-4i for submit@debbugs.gnu.org; Thu, 14 Sep 2023 10:12:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgn55-0007VG-9M for 65494-done@debbugs.gnu.org; Thu, 14 Sep 2023 10:12:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgn4s-0003N5-Cg; Thu, 14 Sep 2023 10:12:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=OzTLohWIgQGSrGftIfb86pKV9kHKUC9AJTZR5fvrxS4=; b=P8iFvT3Pu8nn7gQS3HRv BCeImpFagH6+DzWYROPkxmvXnJw7RCsBycA6T5itfpxI0FGtWiMMsxsbOu1WmJLzRsouRK3fAPq2l i+DMSeG980t+sPJKXlg26qW55pxJGkvMxgA4ss3j4G/aMV9G0fpJZOkxTOvz6w20lFF7kLHJIpsrp MmmcSD1qca2SAqLr1xtYwp/Iz9hJy2QWIBk3eZreYuVx8Pk71yIanpCooDnB74LP0cS2HS8rfLPdX hbseoW+36odBstLGHF3yk89IeBteu6BBxQlh3vdr3nPDgtshIG5YRcVUqquz1GoBwbqnNu7gk2zEn yaHPa4KqmRpaYA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Thu, 14 Sep 2023 16:12:11 +0200 In-Reply-To: (Ramin Honary's message of "Thu, 24 Aug 2023 18:05:26 +0900") Message-ID: <877cosc090.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.91 X-Spam-Score: -5.91 X-Migadu-Queue-Id: 54B66318CF X-Migadu-Scanner: mx2.migadu.com X-TUID: II0uNBfU3yKU --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Romain, Ramin Honary skribis: > From 465538f4b2824f49d99e4eef799f25f644a37bbc Mon Sep 17 00:00:00 2001 > Message-Id: <465538f4b2824f49d99e4eef799f25f644a37bbc.1692867653.git.rami= n.honary@cross-compass.com> > From: Ramin Honary > Date: Thu, 24 Aug 2023 17:57:51 +0900 > Subject: [PATCH] gnu: Add stklos. > > * gnu/packages/scheme.scm (stklos): New variable. I went ahead and committed with the changes below. I used =E2=80=98which= =E2=80=99 instead of =E2=80=98(search-input-file inputs =E2=80=A6)=E2=80=99 because w= e really want the native bash and rm here. The license is GPLv2+ because files under lib/ explicitly say =E2=80=9Cor any later version=E2=80=9D. Last, I noticed that the tarball comes with copies of libgc, libffi, and PCRE. Could you send patches to =E2=80=9Cunbundle=E2=80=9D them=E2=80=94i.= e., add these packages to the =E2=80=98inputs=E2=80=99 field and ensure the build system = picks them up? Thanks! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 0165875b93..ad06d7db06 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1242,6 +1242,7 @@ (define-public stklos (version "1.70") (source (origin (method url-fetch) + ;; TODO: Unbundle pcre, libgc, and libffi. (uri (string-append "https://stklos.net/download/stklos-" version ".tar.gz")) (sha256 @@ -1254,22 +1255,18 @@ (define-public stklos ,@%gnu-build-system-modules) #:phases #~(modify-phases %standard-phases - (add-before 'configure 'patch-sh-paths + (add-before 'configure 'patch-sh-references (lambda* (#:key inputs #:allow-other-keys) - (let ((bash-bin (search-input-file inputs "/bin/bash"))) + (let ((bash (which "bash"))) (substitute* "configure" - (("/bin/sh") bash-bin))))) - (add-after 'configure 'patch-rm-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((rm-bin (search-input-file inputs "/bin/rm"))) - (ftw "." - (lambda (filename stat-info f) - (when (and - (equal? f 'regular) - (string=? (basename filename) "Makefile")) - (substitute* filename - (("/bin/rm") rm-bin))) - #t)))))))) + (("/bin/sh") bash))))) + (add-after 'configure 'patch-rm-references + (lambda _ + (let ((rm (which "rm"))) + (substitute* (find-files "." "^Makefile$") + (("/bin/rm") rm)))))))) + (properties + '((release-monitoring-url . "https://stklos.net/download.html"))) (home-page "https://stklos.net") (synopsis "R7RS Scheme with CLOS-like object system") (description @@ -1278,4 +1275,4 @@ (define-public stklos as well as light. The implementation is based on an ad-hoc Virtual Machine. STklos can also be compiled as a library and embedded in an application.") - (license gpl2))) + (license gpl2+))) --=-=-=--