From patchwork Sat Feb 18 00:31:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Leporte X-Patchwork-Id: 47080 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 69462169D6; Sat, 18 Feb 2023 00:32:36 +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=-3.7 required=5.0 tests=BAYES_00,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 932A016600 for ; Sat, 18 Feb 2023 00:32:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTB93-0003nl-HW; Fri, 17 Feb 2023 19:32:05 -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 1pTB91-0003nK-T0 for guix-patches@gnu.org; Fri, 17 Feb 2023 19:32:03 -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 1pTB91-0008Ht-KX for guix-patches@gnu.org; Fri, 17 Feb 2023 19:32:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTB91-0007jD-H1 for guix-patches@gnu.org; Fri, 17 Feb 2023 19:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60827] [PATCH v5 4/4] gnu: Add dozenal. Resent-From: Jake Leporte Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Feb 2023 00:32: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.167668030629663 (code B ref 60827); Sat, 18 Feb 2023 00:32:03 +0000 Received: (at 60827) by debbugs.gnu.org; 18 Feb 2023 00:31:46 +0000 Received: from localhost ([127.0.0.1]:41910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTB8k-0007iH-4a for submit@debbugs.gnu.org; Fri, 17 Feb 2023 19:31:46 -0500 Received: from mail-dm6nam04olkn2088.outbound.protection.outlook.com ([40.92.45.88]:18085 helo=NAM04-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTB8d-0007hR-J3 for 60827@debbugs.gnu.org; Fri, 17 Feb 2023 19:31:40 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DzngGjr0sZPThHh8f/yfGkSFZV8fDt/tqU9am1wuSOX5aurcb26YDa8Jo9yZXi/1l8P9bal/mhEwTFvkUqMfPQlYEf9XQHIAvRkAA0+aENE3lbjYGSiLamhVP9UM1U/mhXUHZAHqXwlU4xdyrYC4w9HgeweSTRSvWmRhGRAAtzP08KqEVWUW2IdUMJ2GECOgxjoGnqc16RjmQ2B2pJNtUmq94JT3BLpUAxdmrZCk3Ow5T4DUQNKt7imh3w99BUoop2VSCI5ywu9wmJzGNpNpeox1TUaH6lHcEqwrOUeg2RRfcS7r6qkE6McoguAn8RLJz0ZAL2W0HjnhW3+0M9Adrw== 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=BZHsz/Yn27QS0FHK31uEObq0vR3EAq2i11X9EZSk+NY=; b=Sr54ADc21Z9Tr//yADRJvDyIqrt++G0YrhPNwJ8kYlzNsT9jQLxcgUFejiObgC8J19Wd8AIZGE2M+WJaMeggl8UmG+lS5czJp4lpJTqQsQwB7YQRvPzXd0XJzh61/8LwdgMc2EVKGdhrka+ey++fPhef9lVqcqyuhHqjOo9LQZnizHJ/ZoU4JRdPDsxO4zNG7H1WQmXtnN7P+dn7b6eDVFSv7gMRpj74KUZZVX7WoyE/snNSfcSdxb8t8MM91ZFcJ8yiBPZOM0vT3p6b4URwQgf+Z9H/OySap9BduCotV2qdYIxSAvlOHcH9zaJaUb/tsiQU5oDwRoY4SAetP4TRhA== 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=BZHsz/Yn27QS0FHK31uEObq0vR3EAq2i11X9EZSk+NY=; b=bTqYHuXnvKTqPHnRLt+U6dKOmGo8xbnxONLQmQzvHVg3rZxbZrIs+efPlKYCMx/F4CHq4+CmrL2VE50tVKLlrN/+Vt2Dkxgi48/EEgCvN3Gkwbh/QmLMl7BZZf28EktvIp8e8HEm1OJK347a0RDdqL/9d9C1ydaO/6xB/QIKlQR5gW9CICf54UQLPk3yoOiomRObalyyJKNkaVLGVMpmtVxhK7nNIQoT0llxvRPbbcH/UO943quJWJYok9G+tGthgkU8/pDv8THHj0uumemObsgob5OWTrVaj1GbXXa6gu8fLDHBADq+h+tVdM8zMObqnWDf/snGzGVSAfbSTxneJg== Received: from MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) by SJ2PR20MB6067.namprd20.prod.outlook.com (2603:10b6:a03:504::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26; Sat, 18 Feb 2023 00:31:33 +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.6111.012; Sat, 18 Feb 2023 00:31:32 +0000 From: Jake Leporte Date: Fri, 17 Feb 2023 18:31:05 -0600 Message-ID: X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230218003105.24983-1-jakeleporte@outlook.com> References: <20230218003105.24983-1-jakeleporte@outlook.com> X-TMN: [8XTXZMS646gE4aZdipFRkdpkzCrNEbXis3JH7UC/UDNibztjFnX1Sw==] X-ClientProxiedBy: CH0PR03CA0379.namprd03.prod.outlook.com (2603:10b6:610:119::6) To MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) X-Microsoft-Original-Message-ID: <20230218003105.24983-4-jakeleporte@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR20MB2605:EE_|SJ2PR20MB6067:EE_ X-MS-Office365-Filtering-Correlation-Id: aa1f1ff9-3d28-42b7-f793-08db11477aea X-MS-Exchange-SLBlob-MailProps: a+H6FLLcF3rRczsWTL/7sEqzcluZqa+ED5DzQOs4jCM+n45Axn4nBp2+HOjWIB2+17DCFxo+OK7hiCamQBba/0ek9zHEotL8SwDE07l+/bluCAVDxE2BzSSZN4HR7eZyIMgR+6g/UJ8EV6u7SWkw9nz82ycFk8kj6mM6Xbdf19yTNhqO4zr6LYl9G7yW2ViH+P4LSs9loYOLHEhpWZOxbftqeAPEAw03iyXeSgvTarU9kNY4g1O7C3ju0QlML7qU3lbRgmr9gjL2W9Zc3O+HuBRnhSDeaIsRriUEYv6NuFTwQMbpB6GC2QyWnSBR772rJNhnwZUKN4PZHZGu0a5BYL+aPevb2uJLkLMvbuebaR99ebkPypomEaQrqqW0PzyIyZHGRBJqcgVkNrn0IpVf/DKWJ7wYQb4f1NzC/pRKbYgnuw504ORAqLsogHESBxA1s0TYdIu7nKNMHR10/DyS6ATUQac4abv6dSkzF3ouTnen5qVXSxwrtSOvJPMjCoKzpkn4kcgY6hQZ/K2PmqxnzCeaoLb0i7NUPgGV8y42n901iqm9V9JvMlAjZzQkxsJqnbAZWJuG9MO8qSy2WV7VZnP/vR0exBQDrpNN2N1qVMn5cVxrcUIva7VeMX6j9aI6aBHqxx1cTZVxz4V3Xg7yew9oiQsEBJNTRsW5mw+n44f0QmhbqD64F0tJxwE43gN8STb72Azsx+VblbpI8zjsVQaMEu+IN4cp08B9w0363Yg9MCZcfifvuMdO+izO58PRHDSWOwn3RX7LOiMaUkbrO/EOdJrBUH5iCajxSuTqwBfvMbgAN2KcAlnbB0xgBLE+ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uLJ36mT9KoImYE5SciZ81J647NjnQ1SdSjoF7Z34lDRoJ0GaAJg188J2SnXtH/E+CkWfPfeGR+u+lUSJonEvL8aY0/TVTtqT9iWKWqtG2geaoh+ILlGG5+czO7BQ5R8GEsl7TeAfpLClJk50HyvO/Ch7j6mbvnzXkEAXjGsRCNlbCc4hpKAcjqvVSeDs9klI0HhI0w/Epwj8nmrmNuaKnUNE9sxKEhspNSCjWn6649GyTSTA4u2LMMOsCoNCnuURNDa2yGvJB3XB5S7cqcmnrSnOE03KvjaiBkEJM7102cyHTbyHLDsBpxjUxEDf5EpqHAhO9oKxPl/UY+M6TH33EpjUGyiDUFU0D/MevDfm3og+U4fh/qzx/AbErVJeJ5Fi5h6zBKTdtXOgU4tTdkwFLVPuc9qz1F+WiJyO78ETH91EWtxmQhHtg7QRL94zhlUhgjZOaO8jAG9n7y70iJBVbtWfvdlpHb4mFAi36fpE452HnhgplM3IqLPJF5Qx9Im8YCbvAldXMZRZEZO6tDHqFPKSMmQDrnw7LRKwxbRnsGVwTZF9dNshaKMELxAA8Fkby/HrkPs16ZpY5L/dp3zWs2Y/nruBUbaPQuvEi51DYtwZola5j/lwasPLqEnI1q+8PnoArQ+55R9NRkZcbDYatg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RK1v5I1fWkdHvtRHxNqRVDhjI6W5LAUoUwGxKaVElFj7U7CvLm8PK898gw5bpwxriFdulWq9RNA0dPA63XT3Qj3s0cZUr6U9yJk8pbNjP22OY17p6Ta72aU/Mzuj5Zj3ZofCtrE100aCGX+NhvckbWKeW3IVM9P/shXuzy91zOeXK5pJCARmJg9sVHXdsnSy+L7dZRM5TgMxmJB9UWNNOE/IOqfSsR3RCTmB9QwQMIIJrWbptxlsSEe7AH0C7bb82aNmEY5WJ2kcjv0e48Z5K+LCaaCYwUKk2TLXRRb3MY6+xG+qF9JZHrAEPQnyZszAkGHDXHsmd8xIaktnmdLWRATHLQ0svVhlKPfUV/22PHKgoXwjz+BsTfHx9PxW58Vf0waX1N5CCauj/JH5fvgQks4qKNISZDEP+F1/mqFg1UqCD2XcB6dtZGTjKEYLzIRWD5NqgEUv4Cs7vozB4PbrVHJa8hInqht7dwOKW56uVjlsC21qkUBz/xdbJLq15gveboDO9yRHPU8EM+GA7xvBodp6I49OwDTqXpHtH+QIGxx0sZTxLhoCjw1xbqnHExf9rB85dbovVJxXzjQv2tzYRMebcKUe8IDo7x5/V593RGsFgBFPtBL1JKcm6sURwQPCE502yd/NI+TOZPZj7wSm17vQ4WkyQIgbbIobyoncJMHUJVtQ8h/3VB6CBgpvByn8Ona90xzfM2FYexHIBQIwfCe/kDi4KSAlgnYlDpP1ULS6MJjLXnG5dCEoBHE6ipsdGvauyNZuZY+7dMlTEUz74NaIckx9LMq0IX0Q2ak2KK7siCzoiJX6G+V5ulY+Nr+QYWGM6H1EBuravNaAdiE94oDpWgOiiA2rk9+5MKr00JzJNZ8VyYeFEhw2nl+oxNdtYXxO+tr4UlcogNL3fuF36pHZUBVCTQJ2Yr+BWbb3IHrRGiOchiy1Z1BWgT0c6LfPfMgBdrpsBhLMvJcxfvQB6ykZqRoQJ4TOqnna6c7Oo+42klRkLputTXp3HJma6Q4YhcY5o55mwtdKivWPUV8RpHS0cjTT1MUVwNKiRkEui5X8eKY+7mAyy9kh2NMCjvIGTdMMrrQLtK+8VR8Gzhmkg4R6/kaprJovgDmxDL84sxrI9EMKCFv2HZAFudlEvm+T49ZhEmhxkDpMgHMzEzq5Lqva/xMPxgTPBOpnAL3w56+nMhjkStK9ydtgvsZLpP5wDpCQtY5s+lpm83+CTlqi8gsnrU+GZTPdGlL5IJiX/mWH79s3s7iVRtKYSjs3DhjGJFhW6xufO4lofjyMxBVxVI1vREgWHzyhalMb7+WAf5CosE+npUVnUU8O0WFjlFIq X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa1f1ff9-3d28-42b7-f793-08db11477aea X-MS-Exchange-CrossTenant-AuthSource: MN2PR20MB2605.namprd20.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2023 00:31:31.0157 (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: SJ2PR20MB6067 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 ceb2f14..dcab621 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")