From patchwork Mon Feb 27 00:39:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Leporte X-Patchwork-Id: 47421 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 23CBC16BFB; Mon, 27 Feb 2023 00:41:53 +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 CEAED1685F for ; Mon, 27 Feb 2023 00:41:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWRZk-0004lL-MB; Sun, 26 Feb 2023 19:41:08 -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 1pWRZg-0004iI-Fn for guix-patches@gnu.org; Sun, 26 Feb 2023 19:41: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 1pWRZg-0005mw-6w for guix-patches@gnu.org; Sun, 26 Feb 2023 19:41:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWRZg-0006FD-2k for guix-patches@gnu.org; Sun, 26 Feb 2023 19:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60827] [PATCH v6 4/4] gnu: Add dozenal. Resent-From: Jake Leporte Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:41:04 +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.167745842123913 (code B ref 60827); Mon, 27 Feb 2023 00:41:04 +0000 Received: (at 60827) by debbugs.gnu.org; 27 Feb 2023 00:40:21 +0000 Received: from localhost ([127.0.0.1]:45388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWRYy-0006DY-Hi for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:40:21 -0500 Received: from mail-co1nam11olkn2095.outbound.protection.outlook.com ([40.92.18.95]:46999 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWRYs-0006CD-8u for 60827@debbugs.gnu.org; Sun, 26 Feb 2023 19:40:14 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jDUjJOCwsnglAUzQwoX+LsVU5vUw8Sh1x4xxps+AqkFTtAOkIYpRzB3ZFEiEkiKc9XmkrRpdRq8VwcsdvxFUKR+KVo3du7uDLfiHb415eOCpzCYrWJM1MBMqt3teKvt9M9ho+tsqXc2jr9ZACPH7PyBN6+UMpkYYyl7MjvHPbC56yvlohbw5idEWGa1iiBF9CoAOp3ov3B3RqG9zDRYA9qtcQqJ1PB9I3RLfadwKJ5MsDPtkSQ3dOjDIZR+4ASioUGLMXOP7tnePGjViMllQI2elXVOT+PipFDv8oOnYlkQw7HGGMp5c0D3CNn6q8qT7V7b1HgG8ovVI1OR5NqKMnQ== 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=dJ4hiMcUtH4dla6w3p8D+TyV29fPvCecXNQpWhLW584=; b=NxiwupDPioSNGS3pHTIz5v+rOcOjYDo3LDn3L4P0AmO7jpwrj0p7KG6/CP0THxrgkVzGnG4nG7P1T2gX1C78fTOg4wrrAxLX9OdMqifNtyoiV2TXP7Hyzo3Gf4UGGBwQbzmpw9pQt3GT7EZwLsf0S3zCifmcLYFcDAp9eQv4DMotHsD37hVu0VXmOS17IXtarU+U+3A/qVX/2XrNt+M6cxpPZZqek/tAtcMCUFvT2D1vMVPFn2/Crc2uz6f0L8JZZ7/qdnmxakwzin8YdWdfz7/S7i3/e8pu7dRZ+39nPqNVyi1ByzHw2MQiIDa8D0+f9FvVzmNw7AsX1Ccg/n5wuA== 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=dJ4hiMcUtH4dla6w3p8D+TyV29fPvCecXNQpWhLW584=; b=NoziBVFIGt8iZoGgWXPsyROsIv/duQPAobWWrCyCR5ITaTvc6wnv+hpw+9WOSUMnrU76oa4fMJAiQEcGmdxll0EDFWALT8Yh9nVOG1wbct9hlJE6ScMFVjiylnR/0TWe1Kxdz1G/hdFj8LcIx8Wg4tGPO2D+/StmuGH2KasNgVPr8hGSXeF1EUfQVq3eSw9T+7mHqr/MaLCEH2u37bWUdRQ36QxiuUldn6cBkMNEMEmQD9BDmY6OsWa3QDqKYsA/2WK5oiEQlKVcR46maurlUz06RK3/IPxmlQVGNJDdD5MQA5EsWIb0nEMfbo0fj1bszbQR8Y3xqchUIfR4dcnaYQ== Received: from MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) by PH8PR20MB5316.namprd20.prod.outlook.com (2603:10b6:510:1bc::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.26; Mon, 27 Feb 2023 00:40:05 +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.6134.025; Mon, 27 Feb 2023 00:40:05 +0000 From: Jake Leporte Date: Sun, 26 Feb 2023 18:39:47 -0600 Message-ID: X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230227003947.25934-1-jakeleporte@outlook.com> References: <20230227003947.25934-1-jakeleporte@outlook.com> X-TMN: [dHJHrszotCuilqIx1nljhcIgO3MXgdwqRu6zPDmDslLe3W2zPNambg==] X-ClientProxiedBy: CH2PR08CA0017.namprd08.prod.outlook.com (2603:10b6:610:5a::27) To MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) X-Microsoft-Original-Message-ID: <20230227003947.25934-5-jakeleporte@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR20MB2605:EE_|PH8PR20MB5316:EE_ X-MS-Office365-Filtering-Correlation-Id: 237df332-9ecc-467f-2b87-08db185b2b5c X-MS-Exchange-SLBlob-MailProps: V85gaVfRD4+aG4arYjbCs6hKknv2gzmuv87ib92CnF4SrQy8nt0z33V/+eEZNLKzgfNpkOi4FcDbiUXqCyr4CsOtfhL/GpVLrHgb6AckoHQ2ii9XsuJ3xTqhzl9dIHbkqpJFCMyAaOUI4Lz7ZXupASaHrVhnL2xnUes7pWf5mUmEwq/n1rwE/cLadYTWi5TQsVeEq1+3qhxLpe9dgT+IDpXd35Jz05LouHBIqdl3JsKjoRTcdUTPp9bruAlxtl/HoDXeAvwpZMIfbVRTYEGH2V+8WuOYCOzJpt/M0VE9i7JAz7wKaCeWAwqFkHPV1S/V+YgKyIQdz8KGEXZUR4O+3IKpksQxZms7KiqzKhQIoFWom5BzIOOziVjA8BohBiWGHavU2M/2fwZXHAUh3tbWzIT5gFMewjL8Mwiyv68bdE3Ulqtzww5EdHEdx7O99KYh3rdOTC8Gku7UlRaTPdrYS1E88YLb+qEde3MTozwqGFAFxxgfXDEGdTQ2xO02HPljMVLjS/xnjdJ8cZ4llqpNzulQmPWIsjek5ttciLC1F9IWHxrKE0Y+k8WvRmyZbwD1nmr1SAJpagubJykDlch922qdM3koki3AO5j6PBhPXnWgJfpgdFwfefR1BtMKEF3kR36n5w9hQg4DBVDQ1IQd4MQZtJme0Ka25owqnGEw7PMDsKiSp9ECbz4jn7XxpUeo+UD8XZraBuZZW2YMG9rX3XJBgb/2DRXXy0jo2a+dKG6DddsM2rY9ITxPMn0gNh+hWNdMXSzxaIKE6dwsZbPp3X/cMLV+BJ5bcHK+/LDVfwr/RND6aHg9ZGqugvgjXcTwzyEzKyYdg5T9M41ZDEtGMQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2rI1Cw/D5oNaHkgclS17LhWZIQc8uvl2twBngLEufkaa3dkhX75mluyJtXekfZ53yWPaikk4S9aZBvTcVp1zK0f86MbYNbUN4MXsqUnEdlYip2jPpcLieavCHF3sfT5g30Cy2Ko5jyi7zpFBAUoqYL+rBOLnvynJJHFRJV3mL8go5oJjQ2PsxdIcQE6/Kld9cxvX1wo3Y1sQXdvEGDwh9iouFkOJ0ZVaYTWBOqVRJ0C158TgT5S6iqSLeMgEXd4a83oifymvD+drGXm2SZDd9+kaCI9rKcirAyyXzeSrKlTus/X2g0JyL8g0+TK3nR4vUhvW75Ezj5vTv80VtbciQVgsLMILLVNvw9kIpCG5shYI+cwSyMkH3k1ljd+ivnu96TDTLgh9vNT5lnbujy/MsKU9POC2w9ArEuAEVO+9H0YnF9SlR4euDTQYLiP4kU/ZnDssvZ4euKR2tnvZf6p0ViO5pHlyhp8/nkKi0TESvtiz9tQDXrScdz7yCA21S1noQBkLxpjq5olD3fiBIBrz3ML8tnsAmzMDX+5DJhUeQHdaLkrCNj6L54ihJDlbFmQ8n5WAHf5TctMk49/j/t8cEk589bPNSuYBNfx8jwixMq89XvTfn7ttYJM6lUVNImz1gjKBhnL9Kk+uPD7PRmHjjQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OH75fuiAhBB+qgREuF3v6DFUWbSGpN3DyGVgvfXA+RPSXl9kf2Qkpse2pr1iC3V9Sr3BQ+epR6pwAHREjDpDOCjO4q4bT7SLR+d1Q3B1wIUdxjlxslC7Yr5Uv5c1+OEnRLUQziAcdT8LJ8wybyysUiL6YI5oDNNyqg7UaEL1+HgLkWtjy0dF73+nDpD4pjDX6zQgTD4NIiUxZeAAi5ySHA9VvhYC2SpPKfWcPABI7vjp8QKDt5ATSEZ8YAuwpvbilIeONblFhyxbYceOktSnWbWMRqT+kJHjX8vQCLgtz9AorbiLIexCrJD2yFZDtgNKCei8JNrxbdvT9evnLU9UFbFirz6AsrZFntO4cWWJgYo66mnsIDvoKxEAQDpNmiBNsr8WmUpEqQ4APAJ1ceISKZinAZPl3HfhwSm9wTMbhkthYIGPDdBOiDaTuqFKCvnr9r0MLSJt8cLAMuVdLqi3vg7cwZOdi1NYC3Pu8hIXTSocOm83d0UzM9+4Tr4nFl3Utl79afjng9vVZmo1jpctgNKrve/ml3y5sJV/kqwgya5taBxm9r6nnuEO2rntqegCmi4/8ZW+pCqZC6hcxhWu1Hnu9OW0Y9LOZbc60cVtmZNSa9FIbo15LcQlozWMIfsHPZ6CIrwi5U0DAcHvzBGlk35DX/okxKUx2Lj2iefdBXn//UH2V8EBF8faEBVGosh0t+KvdvKfc9MGpETDWLKk3SPIsQTMxPf1y+KHOWb8w5jekpWXc1u8aS0W7RblDTQlRTLJ0agUGFtgg5mSIQE/VvLLw0AuAyAZHvZaBQl9yRG+MGtx82ygpQysgHTPZiCsGmDkWLqhtcT55kUuTX3UueOBe0paIYTDJWoeADEeTBXCq0Zg6piOpbKK/VR/BImi3e2tkmx9qj6XBYvWWfdVBPY0dglF3HXB9QDKicwNjoit17O/o477CVPjPjUVJIDrlA+uIeSqGYhPnhWHAtdLPEq6F1wkrmZ596Y8Ziw+hrYwaKHqr7DyAXsZfdtPDFWIIV/jYe8T6Sjfq3es4FlQfifHBE+wJDnRCsJlTdnug9LBNh7IW8/McbBAS9xCqOddv8Si1gdJ/YWxnFX1s/ncNDMAkh9DR40Y+/iUoPhhZGKRid4lhjzoZjuq+IaDDExxKfoYLCuaC7yDr49JitjsyJAgT07BuCx87tZ8qPdWVnkMJg7ehrTvExoD8g5DlJ+INLgMiRVaj/GptnRFpeq4p7wLQZqzvHozQVsZeQQ7EtKjkwBKi+hF5tYkTry6NI2VKcb+5/2sG+og2p1nXa3ktA3Gp2IBmXb8u8UWgdX19fPKKVn+wn5kGfO8xgHISE1l X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 237df332-9ecc-467f-2b87-08db185b2b5c X-MS-Exchange-CrossTenant-AuthSource: MN2PR20MB2605.namprd20.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 00:40:05.4733 (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: PH8PR20MB5316 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 280465e..86beb33 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -103,6 +103,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) @@ -124,6 +125,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #: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) @@ -172,6 +174,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)) @@ -455,6 +458,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")