From patchwork Mon Mar 6 12:47:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Leporte X-Patchwork-Id: 47740 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 9168B16D75; Mon, 6 Mar 2023 12:50:18 +0000 (GMT) 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 4DC2B16884 for ; Mon, 6 Mar 2023 12:50:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZAH7-0008Ma-5h; Mon, 06 Mar 2023 07:49:09 -0500 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 1pZAH2-0008Ki-3R for guix-patches@gnu.org; Mon, 06 Mar 2023 07:49:04 -0500 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 1pZAH1-0006Qm-Ot for guix-patches@gnu.org; Mon, 06 Mar 2023 07:49:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZAH1-0004o1-Kx for guix-patches@gnu.org; Mon, 06 Mar 2023 07:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60827] [PATCH v7 4/4] gnu: Add dozenal. Resent-From: Jake Leporte Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2023 12:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60827 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60827@debbugs.gnu.org Cc: Jake Leporte Received: via spool by 60827-submit@debbugs.gnu.org id=B60827.167810690918357 (code B ref 60827); Mon, 06 Mar 2023 12:49:03 +0000 Received: (at 60827) by debbugs.gnu.org; 6 Mar 2023 12:48:29 +0000 Received: from localhost ([127.0.0.1]:41594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZAGS-0004lr-4H for submit@debbugs.gnu.org; Mon, 06 Mar 2023 07:48:28 -0500 Received: from mail-mw2nam12olkn2040.outbound.protection.outlook.com ([40.92.23.40]:38390 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZAGO-0004k0-Kg for 60827@debbugs.gnu.org; Mon, 06 Mar 2023 07:48:25 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ddVWompogoSLwzk7Mj3u+/DAabZ780qGD/mervA4yM5IN06VPVj0ZEEgFDkUi4DLHwRJiaowddoHfFLWOsXNWw1aFLj3RNnmZSLYu9aqgk2mJBfeGBn5elykoOFw5c/9YK32fDIKa4+wDskoAqRDgB3NmCAHQO+r6pg3IFm2+Sfx/Ykn/dYpL5dS4Si9M7WlnePqYu7mgJG0MOcSxdRRSwt3sII4HyUlrtUvF9rweNF6ZvxPFZgsgsXni/A5UK5kSrZjPqO6Ap3CkN2jZTz6H6ItmhmJhoxSLkqr8JW0J6VcB1IGj6pKWq35/SjC7pdfzsTVAYT24Q3UdIlKaaUr7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=q6K/1jUGyUufr/LVpwBnw+M41kfGywqLOsgTSuHkScc=; b=MytruEOSxCxGlWLnsRA2Vv2m23w+hvnPhd64c1gYujogb0Y24LekDcj48TqyPSc6zIfLUbrGQvF+UChmtIeR8azvBd2H1Fzr6IlCFw7OhdNTY5lj63v7l6QK7gPEVt7KfXYFMYvjXYIIrPVe3dKrWzvHfSkdtbmsb7IpybNqqhz3GyY/Fp/msQTPPckmi8IuPCBX8iS9LWyQR8vR+DGxoxIj9vj50fNDWZHVaw/t7+2zn3b3PN76N5P3bJFJkvAbMBOFnQeOHhWpvs3x968BR/x4YJUSoVRjOtKVQjjdJnJzVbD8PoHLynyqlJzxGW2McqieCD8Mkr78uLo96Mk+bA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q6K/1jUGyUufr/LVpwBnw+M41kfGywqLOsgTSuHkScc=; b=m+WDON6wSizYu/a4m/5IUgz1PUk98Yu+ykoCDe35Zax1qobc/oXPVz9BoOONZoZ4RSE2lUmg7l2l5zYciW1GQA8zVNOtzvRvjU7/+hPbImGurragbNfDQ0G4jVuNvclzRedaagyrXrSEsfWe9wwROrpM+X3OC4a+6z47yHjMbEkp8+YotxFIOK5mcPL5B763LHSAARAtKhMztf0kAbLkJVQQ7J07t09i1S3doZDvIkpc/vMJeh/MG1Vtjv4g2dQRULvURqw8iY9yfPUCLxQlevB+E0Vdpb3NQvNMBH+ViEAFu6J4tIryAez5wVwbyLt5V9eZWgR+ezv7W28KvyP6GQ== Received: from MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) by SA3PR20MB5791.namprd20.prod.outlook.com (2603:10b6:806:31e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.15; Mon, 6 Mar 2023 12:48:15 +0000 Received: from MN2PR20MB2605.namprd20.prod.outlook.com ([fe80::54e4:62df:c788:9c14]) by MN2PR20MB2605.namprd20.prod.outlook.com ([fe80::54e4:62df:c788:9c14%3]) with mapi id 15.20.6178.015; Mon, 6 Mar 2023 12:48:15 +0000 From: Jake Leporte Date: Mon, 6 Mar 2023 06:47:59 -0600 Message-ID: X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230306124759.21905-1-jakeleporte@outlook.com> References: <20230306124759.21905-1-jakeleporte@outlook.com> X-TMN: [JhoeEk0qGQZxN1S8suNQ84Qr1qQnRNl+nd3JUVVyvqRnQYKNR8FMuA==] X-ClientProxiedBy: CH2PR08CA0015.namprd08.prod.outlook.com (2603:10b6:610:5a::25) To MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) X-Microsoft-Original-Message-ID: <20230306124759.21905-4-jakeleporte@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR20MB2605:EE_|SA3PR20MB5791:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a4b7bdb-02b7-417d-454c-08db1e410d66 X-MS-Exchange-SLBlob-MailProps: Z9TzpHVL8qpimeSDj4hLwUPq1BRLfF9ZZz99AHjGuVhIkANxk9wsqLCkWUI5W/t+6fQKf+pRCj7vW/7+37JsxABbxPjKah7HIkVchaLd+l3bZA/z8RKbvXzptoowT0FwJLwFD/n/wB667NvcgFpD4aO9/RNLU/TdgDpDMDBvq4BwmKSF87gdnCoBiOGhmlUJ/gmysqbZjpa0McfR/s+lkoQM9zEzuuNWCHd0TSo6sC0xU2pxGlvUKWklLO/fvEEqKYL0DDTHao2gQCQyqR4d7qRfwRm3+xCdvfkWKRe6yH0h5XTSt7yWWR0nkmi6hDBJI6iZiKY1srJ8QUZTo0+RzCu2mmoTLV5cSqd3w1sADThUaebL+NhGwGFXcZ7N8Toj/vD7YeeKj5c3BPKcF9PM9IEowjOikLKExyBgDQrswiM0YFEaUxAxay0jDxugJnMHB16lEXgtUKqTYEJaTStMGm5DQLDA4lxkHcI89aTWQPuVXSQ3MZXbuwaAD6QWLUUaQHHSCJPauO9h1n5aczN25ULeJelKtc1SFEPJscX7xc4/nrCEymgz72y40D9zF2YKC28zj6GKg2ktPcM9wEImXPjkRu7anonEiHZBQswuSdWjN55Mu2QCLItpceltA4V6s9L28wXJL4g+ZgN2VX937CbDarYKFqSyMt5jGjhcMdMFQeTnsMYVhU2LuzcK75eAaMCmeqgcFD6jPvG61kNuoEscK6IB6gi4msmho63HttnccJOn8IAQT8pR2t5q8tGskCmIlfe9hX8yPu3lsGpunQ3LnyjhWcPWyGre8ka0YzgbXQdWBMFSm4s+TbRbveWExlD646NPIJIRKU+uzzaj2M2Lg57O8D+nes9+O/p4qHKY0BAux/YVUQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fMkY9FqYSYjTXREieT3X+fEEUb/rkIcHdShmd3aPcVIObYkEcyrTf9fF7qFUcE/cRi2wGIkDMZAmxxzq3TjxL1dTc9AtY/CgmJFxLSsc6pQhMuDdGZRPJJGqVv6GT5IB5Det2E2lygwIsjExtKbWPEtVpy+RS5ifpalWHmXG2k2LL3heqQ5WPvjxyIER2LpNgN0Vv2IAJNgtJdm5wrOEh3nGPjgH4vTkWxePFWFM+FF2wSDnyD/G0WB1/EEVeRrm+Af+jKQsM4u3Dvp3cjfvENe+BjKSAbZrORFLG1dxbuVlyEupjdtYW3PybpQvSNcSi7CaDzDY9kuowu39mLlpdmwsxkE/DJ1G5ueSnVHTGkncjdEqIz3XkJRK561/hJ2Mfj8CoJGgvfFpbc8iFA609ZSfYx7qYfarRQJCF6IlPbd1dPBG8+gohrqPZm+Cz4h3g76TJagnsA//p8Fo37j9EcYuaoBVMoCCmxSjnNsA2mc/s/JdobmtXZNqaPWd1q0h7FlSxkH27HKfigPbY3SAO0aux7BSx/oFcBGppCaTsaVusbZzVhFRleV8lqF9OcXqSxs9m+AMmnfhhtPy1s0bXzdDArp+QAU3jhGVRVJuKeBfAJXSsiXPhj3fiMvU07a5m/gGZs4hqrrqWpJbgEVkXQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Pq1U1wrWu7Agrl6R6M9E4YiDhvZDN8CggtkdraWc2RFTKa1Ni1a9CWIc2PzHZGjc2Hya7mcZHO6t8sbloaaujO9R52hh/Pv4thno+5YUvoiazHhx1xeqI1Gim+Ppuv7irM7zNZB00a+cQTeYObxrDHOoL2hBHxaSKLCunjdMgphYky3nul0/fKGMmWBaa/Mf+zkS/Wr5bMc8KjwYDhs7mLQLJAySfx0QVNOhLwczMFmCkkgga+q14IYj+lyGl9CwuAR0srmjyhmJW27zvfCrAqsv2lIf1yrVqQBrjLUZ1ufp8Vsn6xLkM5PFSulYVW0bZSFTuWqDfIdPhdcAFh7bgg87e/U97IrHRBNcizvp12Rhl1MF2jEhnZNeYsihErj9lHpSVXREvpxWLTDbUtw/MxkTdBms3WlklOgSlg03uIW9wB9h1o33kqpDB0hSM0aC5wkSCMK4KV8bT8tnvkOfhTNATJlobQ178/q0tqdp1GjsAWAIH3GZ38397ZoyULHS6a0PIBTvbNZxrX+0rWsYZL5S4dAqk1yTwQq28lNL4Lr0I8eCkBvCl21RZVk9wwuOBIpPRSC1poP9IYxiwt3TH44G47Lkj48ngYkyg9qsxnVDy3y2oQgiKIYb21mT/jEDT9uJbzYCvKCI9ipuRhE6TevqYjxwBJwjD5CnlaYDKUP5Ooa0+XV9eH8DvClB9P/jc9H+hZVbSOH0nSZP7Kp0MfVU6bTgPRGgUm4ovETk47OQDNdcHtItPrMr821eC9/lZwxPRttSyg9VH9nNRDqvmdS1Cuf6BGFexon/r5jScKEpY/x2XCS0kqbKwQiaCxC4FFW6l9datNVMkH4xtx1kNA69hUrKTGONxXWcp3WubkPKCrYmEoYOAXlGKG1HoDxK5yV1Bb/7XQzY7FFdZXg6Oo1lKF1po8xGHpDXuEyn6Muut+d4BHltphM90d213Sk5dsa0a07xB3IzdxcbFrMAcWBcNLGZpQx33+U4dbIjeopv3Q/hg8rVqZKPXb1tsLCmJIu6JglCEBp13Xzw4ps3f7tn1ETJJVyF+ILouCp3h7XNwyDx8vrprX2gdwAtM3rm5CTCGPAJ5oPIrYEIYgBOjHhqRLRAlvWENEZ/6CGoCDMSqXOdNhM/UZX6SkJwm9ysYyGt2R8IE0Krp9/X6F0N3EHrVjAAgypITe8I/cOMGEWZCrtgSRxrZOm0rl4WCaRhu7W8OMjujyaRGCw9mlK9QleTmETbvXZAymyaeru2FRfiqgwo0t1qMscLNBGG8Yj7gAz525jmr0zwf1h49k50K0np3m4GLWyMYKeDQQvSAf7ghKJnSY2u2yUJCdN7xBgn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a4b7bdb-02b7-417d-454c-08db1e410d66 X-MS-Exchange-CrossTenant-AuthSource: MN2PR20MB2605.namprd20.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 12:48:15.2851 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR20MB5791 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (dozenal): New variable. --- gnu/packages/maths.scm | 105 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a7497f1..0e622c0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -104,6 +104,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages calendar) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -126,6 +127,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages glib) #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) @@ -174,6 +176,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) @@ -457,6 +460,108 @@ (define-public dionysus (license license:gpl3+) (home-page "https://www.gnu.org/software/dionysus/"))) +(define-public dozenal + (let ((revision "1") + (commit "328bc03ad544179f2cccda36763358c4216f188e")) + (package + (name "dozenal") + (version (git-version "12010904-3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/dgoodmaniii/dozenal") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0knwfwjqdv854l5ny7csdpvp7r0md6a2k43a1l2lkyw9k3cglpph")))) + (build-system gnu-build-system) + (arguments + (list + ;; Some test scripts are included, but no makefile-driven + ;; tests, and they are all quite manual to run and check + #:tests? #f + ;; Running with `make -j' causes the build to fail. + ;; This is likely because this project uses the + ;; "recursive make" structure, where each + ;; subdirectory contains its own make file, which is + ;; called by the top-level makefile. + #:parallel-build? #f + #:make-flags + #~(list (string-append "prefix=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "dozenal"))) + (add-after 'chdir 'patch-lua-references + (lambda _ + (let ((lua-name (strip-store-file-name #$lua))) + (substitute* '("dozcal/Makefile" + "dozlua/Makefile") + (("lua52") + (string-take lua-name + (string-rindex lua-name #\.))))))) + (delete 'configure) + (add-before 'install 'make-bin-dir + (lambda _ + (mkdir-p (string-append #$output "/bin")))) + (add-after 'install 'install-html-docs + (lambda _ + (invoke "make" + (string-append "prefix=" #$output) + "installhtml"))) + (add-after 'install-html-docs 'split-outputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each + (lambda (prog) + (let ((orig (string-append #$output "/bin/" prog)) + (dst (string-append #$output:gui "/bin/" prog)) + (man-orig (string-append #$output + "/share/man/man1/" + prog ".1")) + (man-dst (string-append #$output:gui + "/share/man/man1/" + prog ".1"))) + (mkdir-p (dirname dst)) + (copy-file orig dst) + (delete-file orig) + (mkdir-p (dirname man-dst)) + (copy-file man-orig man-dst) + (delete-file man-orig))) + '("xdozdc" "gdozdc")) + (wrap-program + (string-append #$output:gui "/bin/" "gdozdc") + `("PATH" = + (,(string-append #$output "/bin"))) + `("PERL5LIB" = + (,(getenv "PERL5LIB"))))))))) + (outputs '("out" "gui")) + (native-inputs (list groff pkg-config)) + (inputs (list bash-minimal ;since wrap-program is used + ncurses + libhdate + lua + perl + perl-tk + perl-par + xforms)) + (synopsis + "Suite of dozenal programs, including converters, a calculator, and date +program") + (description + "The dozenal suite is a set of programs designed to assist with +working in the dozenal (also called \"duodecimal\" or \"base twelve\") +system. It includes number converters (dozenal-to-decimal and +decimal-to-dozenal), an RPN calculator, a graphical calculator, a +metric system converter (works with imperial, U.S. customary, SI +metric, and the dozenal TGM), a pretty-printer for dozenal numbers, a +date-and-time program, and a dozenal calendar programs, complete with +events and to-dos.") + (home-page "https://codeberg.org/dgoodmaniii/dozenal") + (license license:gpl3+)))) + (define-public dsfmt (package (name "dsfmt")