From patchwork Thu Sep 14 04:28:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "B. Wilson" X-Patchwork-Id: 53795 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 29EC227BBEA; Thu, 14 Sep 2023 05:29:28 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_BL_SPAMCOP_NET,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 8199927BBE2 for ; Thu, 14 Sep 2023 05:29:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgdyT-0005Ju-TX; Thu, 14 Sep 2023 00:29:05 -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 1qgdyR-0005JF-CD for guix-patches@gnu.org; Thu, 14 Sep 2023 00:29:03 -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 1qgdyK-0001tB-3r for guix-patches@gnu.org; Thu, 14 Sep 2023 00:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qgdyP-00084M-MP for guix-patches@gnu.org; Thu, 14 Sep 2023 00:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65930] [PATCH 1/1] gnu: Add dzaima-apl. References: <20230914042643.13212-1-elaexuotee@wilsonb.com> In-Reply-To: <20230914042643.13212-1-elaexuotee@wilsonb.com> Resent-From: "B. Wilson" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Sep 2023 04:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65930 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65930@debbugs.gnu.org Cc: "B. Wilson" Received: via spool by 65930-submit@debbugs.gnu.org id=B65930.169466573030999 (code B ref 65930); Thu, 14 Sep 2023 04:29:01 +0000 Received: (at 65930) by debbugs.gnu.org; 14 Sep 2023 04:28:50 +0000 Received: from localhost ([127.0.0.1]:36459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgdyD-00083v-SJ for submit@debbugs.gnu.org; Thu, 14 Sep 2023 00:28:50 -0400 Received: from m42-5.mailgun.net ([69.72.42.5]:37968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgdyA-00083g-Ll for 65930@debbugs.gnu.org; Thu, 14 Sep 2023 00:28:48 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.wilsonb.com; q=dns/txt; s=krs; t=1694665714; x=1694672914; h=Content-Transfer-Encoding: MIME-Version: Message-ID: Date: Subject: Subject: Cc: To: To: From: From: Sender: Sender; bh=RFD138bQsSeJuSX9WcVcznGTyCGnIG25WtWzdOOqZ/s=; b=5Vn5hKxL+u6ggrAqQq9/hLBJBZvqLo9Vm/MAyxmUtRrkrTHzA9cvCyWJENHXVYdiu6v+/rtSCJQ+tRyDKgk8zYdbANaQBlU3njg3jaEXm4k3H/xDfyGfKSGdYXTc9oLXp9Xh1gZLg8k4k8/vwj4G6/SqWN55TbZ5suFluh8+39ypSgY6sXForm8N7Dc73UKc4jiGWwzvbZKlqRkzqrL8NQFTKVkveN3tI8Vn9d85ZqFLp6MX9N0xkdtQp5Ip4c1UBSuQvklfXVyO6ib6g6rlfl55r6tAPIMms9FesfBQfbVJkkFzCETLwmxNRPU7SdjKokoJtdsDeLhmULyJ0/1pzw== X-Mailgun-Sending-Ip: 69.72.42.5 X-Mailgun-Sid: WyJhNDY2NyIsIjY1OTMwQGRlYmJ1Z3MuZ251Lm9yZyIsIjA4NTQ3YSJd Received: from wilsonb.com (wilsonb.com [104.199.203.42]) by 24c51b9677e6 with SMTP id 65028bf248cf7bb1936ebbcf (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Thu, 14 Sep 2023 04:28:34 GMT Received: from localhost (199.147.145.153.ap.dti.ne.jp [153.145.147.199]) by wilsonb.com (Postfix) with ESMTPSA id 46B0BA0586; Thu, 14 Sep 2023 04:28:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wilsonb.com; s=201703; t=1694665713; bh=RFD138bQsSeJuSX9WcVcznGTyCGnIG25WtWzdOOqZ/s=; h=From:To:Cc:Subject:Date:From; b=tzuOujnsPAXfnzx1rwNNCq7XYVsegxEVavUAKdpJjXkBkOAXMtzScRqskhM8H8WcR mqfnBtYs5DAKa29cerk+OJdNySMbXRr3LIlZRBiFn/bPszjKg/cS9DcnX13pON/kBM T8+FNu2oYBAPVja1dire2Ii/hdC9IsRtqMQlWH6uO9kFbGjtqk9PkL/BM5HZVvrlvL oltFdmCT8i/ux+nXJcHcPYLsq8TeP3LJE3XfxLfsK1jkq7B9ADqpLQhYQQaaLkSuHO cu4wZ9f6xOYfPaeXnJox1mVFrkGbZQpFpd57ycCB4gd65XgzMcqrVnZKvbrJwgs06E aLYFXLHhAYyKyVq3jRXp/R85/ftLBVun1E9Ojv50W12fg+QtZ8ORgRftGgonFxrekG +AJ5HlWRs8HYz5q8UI2xKF8l05YkloTrrWLf13OEqb6qLqCzfR0MTo7SsmWO0TFtlr T+eA620g5op/cualcehmocg+dC1YNlCxXc1O0phFw3Vig/FcK3TQ7SMJ/KAglNjuGt 2Rdq/nKcA5XT1wHluQtkFgvm+JGoKSyEh1V8NOyVvXNzmXeNHfoez/7Eo4YFD8f66U xq2l3Yu6G3eV6TnUt+/GOy0ce/zhvqk7b+N8nHO5j/t9Qrj1NV1ppfiE36ZpMXsuEe uMBzCBV0KEKWrHeZNzifbGYk= Date: Thu, 14 Sep 2023 13:28:30 +0900 Message-ID: <20230914042830.21338-1-elaexuotee@wilsonb.com> X-Mailer: git-send-email 2.41.0 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: "B. Wilson" X-ACL-Warn: , "B. Wilson via Guix-patches" X-Patchwork-Original-From: "B. Wilson via Guix-patches" via From: "B. Wilson" 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 * gnu/packages/apl.scm (dzaim-apl): New variable. --- gnu/packages/apl.scm | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index 6a8d97848b..eb2793dd0f 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -28,8 +28,11 @@ (define-module (gnu packages apl) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (gnu packages bash) + #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) + #:use-module (gnu packages java) #:use-module (gnu packages maths) #:use-module (gnu packages pcre) #:use-module (gnu packages readline) @@ -120,3 +123,85 @@ (define-public font-apl2741-unicode including both uppercase and lowercase underscored alphabets, as-of-yet unused symbols, and almost all Latin-1 accented letters.") (license license:unlicense)))) + +(define-public dzaima-apl + (package + (name "dzaima-apl") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dzaima/APL.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1hnrq0mlff6b9c9129afphcnmzd05wdyyfs905n421diyd5xa0il")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (inputs (list bash-minimal openjdk18)) + (native-inputs (list `(,openjdk18 "jdk") zip)) + (arguments + (list + #:imported-modules `(,@%gnu-build-system-modules + (guix build syscalls) + (guix build ant-build-system)) + #:modules `((guix build gnu-build-system) + ((guix build ant-build-system) #:prefix ant:) + (guix build utils) + (ice-9 ftw) + (ice-9 regex) + (srfi srfi-26)) + #:phases + `(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let* ((javac (search-input-file inputs "/bin/javac")) + (jar (search-input-file inputs "/bin/jar"))) + (mkdir-p "src/build") + (apply invoke javac "-encoding" "UTF-8" "-d" "src/build" + (let ((files '())) + (ftw "src/APL/" + (lambda (filename statinfo flags) + (if (string-match ".*\\.java" filename) + (set! files (cons filename files))) + #t)) + files)) + (with-directory-excursion "src/build" + (invoke jar "--create" "--verbose" + "--file=dzaima-apl.jar" + "--main-class=APL.Main" + "APL"))))) + (delete 'check) ;; Upstream implements no tests + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share/java")) + (wrapper (string-append bin "/dzaima-apl"))) + (mkdir-p share) + (mkdir-p bin) + (install-file "src/build/dzaima-apl.jar" share) + (with-output-to-file wrapper + (lambda _ + (display (string-append + "#!" (search-input-file inputs "/bin/sh") "\n" + (search-input-file inputs "/bin/java") + " -jar " share "/dzaima-apl.jar \"$@\"")))) + (chmod wrapper #o555)))) + (add-after 'install 'reorder-jar-content + (lambda* (#:key outputs #:allow-other-keys) + (apply (assoc-ref ant:%standard-phases 'reorder-jar-content) + #:outputs (list outputs)))) + (add-after 'reorder-jar-content 'generate-jar-indices + (lambda* (#:key outputs #:allow-other-keys) + (apply (assoc-ref ant:%standard-phases 'generate-jar-indices) + #:outputs (list outputs)))) + (add-after 'generate-jar-indices 'reorder-jar-content + (lambda* (#:key outputs #:allow-other-keys) + (apply (assoc-ref ant:%standard-phases 'reorder-jar-content) + #:outputs (list outputs))))))) + (home-page "https://github.com/dzaima/APL") + (synopsis "APL implementation in Java") + (description "An implementation of Extended Dyalog APL.") + (license license:expat-0)))