From patchwork Thu Mar 30 02:12:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "J. Sims" X-Patchwork-Id: 48794 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 2C8D4171D0; Thu, 30 Mar 2023 03:13:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 16AF9171AB for ; Thu, 30 Mar 2023 03:13:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phhmk-0001yF-0G; Wed, 29 Mar 2023 22:13:06 -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 1phhmg-0001xk-W0 for guix-patches@gnu.org; Wed, 29 Mar 2023 22:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phhmg-0004ed-OC for guix-patches@gnu.org; Wed, 29 Mar 2023 22:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phhmg-0006JB-6P for guix-patches@gnu.org; Wed, 29 Mar 2023 22:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62282] [PATCH] gnu: gerbil: Upgrade to 0.17.0. Resent-From: "J. Sims" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 02:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62282 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "62282@debbugs.gnu.org" <62282@debbugs.gnu.org> Received: via spool by 62282-submit@debbugs.gnu.org id=B62282.168014235524206 (code B ref 62282); Thu, 30 Mar 2023 02:13:02 +0000 Received: (at 62282) by debbugs.gnu.org; 30 Mar 2023 02:12:35 +0000 Received: from localhost ([127.0.0.1]:55290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phhmE-0006IK-6C for submit@debbugs.gnu.org; Wed, 29 Mar 2023 22:12:34 -0400 Received: from mail-40141.protonmail.ch ([185.70.40.141]:35721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phhmB-0006I5-Dr for 62282@debbugs.gnu.org; Wed, 29 Mar 2023 22:12:33 -0400 Date: Thu, 30 Mar 2023 02:12:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1680142343; x=1680401543; bh=gRhMtH6Weo+ZUkrtTrlgh7ROPOsLKWywELOc7/ilQ9w=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=fAc3FzM7dbLnSMmM5p+O9Qh20C60cFPvvznh9oodjQkFWsrmkGOtWE4MJhe2AymVh SmfoX4z1hvtmFj+PQl0LZpeqsvjMNSh2y2F3OqLV4umwTAhPARdqgBQfp8eMvcI0ch MJOvlHCs0R3VJoEX5Yjo58BZcWs2d+hNJgXQ5X14SkpZLyjUEzusRZ/AAqLrxs0UFb wbqRjTAObr09y3od+gkU6UCIrEwO0WRt4mtz+wZmO6HweRDAiNWui53NDXtL9mGd09 fFTMGb7zu/pO+ycC5uYNFGQUHv00rJ9a7LVReXwVmgwtgAl1xRq9k6Fv04MelIC+KB msgmUCuAlkMcA== Message-ID: In-Reply-To: <0121a7d5-ed7a-9272-1c67-4182d979dd0d@makinata.eu> References: <0121a7d5-ed7a-9272-1c67-4182d979dd0d@makinata.eu> Feedback-ID: 12133992:user:proton MIME-Version: 1.0 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: , Reply-to: "J. Sims" X-ACL-Warn: , "J. Sims via Guix-patches" X-Patchwork-Original-From: "J. Sims via Guix-patches" via From: "J. Sims" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello, > You should split these changes into separate commits. > > Take a look at https://issues.guix.gnu.org/61845 or search the git history for “G-Expression” I have done so and the new patches are attached here. The first two patches have the same effect as the initial patch. The third patch enables a set of features that were not enabled before, but which it would be useful to make available to Guix users. Thanks, Juli From 3ea0527aab1924ff3eb49f7714400ae88e2dfd65 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Tue, 28 Mar 2023 23:05:15 -0400 Subject: [PATCH 2/3] gnu: gerbil: Use G-expressions. * gnu/packages/scheme.scm (gerbil)[source, arguments]: Reindent. [arguments]: Rewrite using G-expressions. Do not return #t from custom phases. Use #:tests? instead of deleting the check phase. --- gnu/packages/scheme.scm | 182 ++++++++++++++++++++-------------------- 1 file changed, 90 insertions(+), 92 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index e6f58aa403..8a510d840b 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1115,101 +1115,99 @@ (define-public gerbil (package (name "gerbil") (version "0.17.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vyzo/gerbil") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0c0nspm659ybgmqlppdv7sxzll4hwkvcp9qmcsip6d0kz0p8r9c3")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vyzo/gerbil") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c0nspm659ybgmqlppdv7sxzll4hwkvcp9qmcsip6d0kz0p8r9c3")))) (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)) - (add-after 'configure 'create-gx-version.scm - (lambda _ - (with-output-to-file (string-append - (getcwd) - "/gerbil/runtime/gx-version.scm") - (lambda _ - (write `(define (gerbil-version-string) - ,(string-append "v" ,(version-major+minor version)))))))) - (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 - (list coreutils gambit-c util-linux)) - (propagated-inputs - (list gambit-c zlib openssl sqlite)) + (list #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (add-before 'configure 'chdir + (lambda _ + (chdir "src"))) + (replace 'configure + (lambda _ + (invoke "chmod" "755" "-R" ".") + ;; Otherwise fails when editing an r--r--r-- file. + (invoke "gsi-script" + "configure" + "--prefix" + #$output + "--with-gambit" + #$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"))))) + (add-after 'configure 'create-gx-version.scm + (lambda _ + (with-output-to-file (string-append (getcwd) + "/gerbil/runtime/gx-version.scm") + (lambda _ + (write `(define (gerbil-version-string) + ,(string-append "v" + #$(version-major+minor + version)))))))) + (replace 'build + (lambda _ + (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"))) + (replace 'install + (lambda _ + (let* ((bin (string-append #$output "/bin")) + (lib (string-append #$output "/lib"))) + (mkdir-p bin) + (mkdir-p lib) + (copy-recursively "../bin" bin) + (copy-recursively "../lib" lib))))) + #:tests? #f)) + (native-inputs (list coreutils gambit-c util-linux)) + (propagated-inputs (list gambit-c openssl sqlite zlib)) (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 + (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 -- 2.39.2