From patchwork Fri Jan 27 02:16:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Leporte X-Patchwork-Id: 46439 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 A6D9527BBEB; Fri, 27 Jan 2023 02:17:32 +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=unavailable 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 60D6B27BBE9 for ; Fri, 27 Jan 2023 02:17:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLEIi-0007o0-Du; Thu, 26 Jan 2023 21:17:12 -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 1pLEIf-0007jM-GR for guix-patches@gnu.org; Thu, 26 Jan 2023 21:17:10 -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 1pLEIY-0002ld-Bw for guix-patches@gnu.org; Thu, 26 Jan 2023 21:17:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLEIX-0005PA-Rd for guix-patches@gnu.org; Thu, 26 Jan 2023 21:17:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60827] [PATCH v4] gnu: Add dozenal. References: In-Reply-To: Resent-From: Jake Leporte Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Jan 2023 02:17:01 +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.167478579620739 (code B ref 60827); Fri, 27 Jan 2023 02:17:01 +0000 Received: (at 60827) by debbugs.gnu.org; 27 Jan 2023 02:16:36 +0000 Received: from localhost ([127.0.0.1]:36511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLEI7-0005OQ-GC for submit@debbugs.gnu.org; Thu, 26 Jan 2023 21:16:35 -0500 Received: from mail-bn8nam11olkn2010.outbound.protection.outlook.com ([40.92.20.10]:19297 helo=NAM11-BN8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLEI5-0005OE-6D for 60827@debbugs.gnu.org; Thu, 26 Jan 2023 21:16:34 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ngBwNYRY+AgEw2N5G82HNOIXGpIWk0F8kKxShTY+Fv06OPnJBY/0ZRlXR3kViu3YIA5jEhqsMrk6AWVvoLJSvJZtcus6iEuKWxVX9/BdIg6IffQvWMUUMFc/4E2KAf2sIqAELMdWA3zv0x48C9fQFL/fDKymKHxLnzqzprUXuDNoq75f822DfdEXsxeCkvYIsBRM2JcE9NYyEAOmtSP13D6nsHBr8v4/dmS94i3qOIR0Oc5UdSeBZAILAc9upJ5Cp/XTGx7UojR/+RGPmSjw1tGfuB0sxNnLMp7DbCo7HFG+G1mKZS/LeGxr1phJCE7yLS/wMKqBGVZyiXwUUT1oGA== 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=8tX5MT9QjsTxzSsZ+0LticEu/qQh9VUUX1Ij7n04VK8=; b=LmqBVFgu3RzbrISsfn3q51VG34AE0mOhCu3gsVaH+DOtvAOcbLQlUjTk1UGdcULODQph74ZYN+y8xFeRFKrKcxxRdaWZRhVT2iLdcHC/okdBLaWu4u14LH/6gr3F/doPq4KNt2GKGnjZmFRb7M0eX+bw7m6obgQ0FhCItsAL4ZoTSll2NDTYguso8o42N5mfj4p5zruiKqt15Ohe4GwTOBkBOlJLlmwl2eW+s1iHsr+wXzSbHBG9qFxPRSoiWN8QAPH4AaLwctwy749HptyZ0EjvZ4e/o5ECFXXzDcxxLdd9dcg6aXqyscqrkemwwg9cUTw46NNo5ysFUjPKraAbQw== 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=8tX5MT9QjsTxzSsZ+0LticEu/qQh9VUUX1Ij7n04VK8=; b=C6uCbRSGV18/8GGE7jRp4NRqIdiAlJXMMhNg6CJ4AseELOnwnV3FPU+eBgP8cUhOCEDjbgLyjg4rYlbT609DKTxfx4IxW+lQdjYvaG2UmN87NM0e9kYSbjeSotAfovxF1eheHDS0oyFCzVL4NXoTOoaIvoiLDFjOlaspZb6lHvfmIjSkYRV1HtqDKtPbp+CsMdKx+CwCJQNwbvgByeho8oyOSvLdIkvFGTwcTHobj8Yeya0faF51jCesvCuoFR8SGbbsM40mTOUhuEuzLB1aHJhBJaklb5arlzMKBWFlV5M7bo5W0vyZWOFJpYxhwNIzfhkKNeetwU87WPG+96Ykyw== Received: from MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) by SJ2PR20MB5951.namprd20.prod.outlook.com (2603:10b6:a03:4c1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Fri, 27 Jan 2023 02:16:25 +0000 Received: from MN2PR20MB2605.namprd20.prod.outlook.com ([fe80::4a43:b57e:52e4:e87e]) by MN2PR20MB2605.namprd20.prod.outlook.com ([fe80::4a43:b57e:52e4:e87e%4]) with mapi id 15.20.6002.013; Fri, 27 Jan 2023 02:16:24 +0000 From: Jake Leporte Date: Thu, 26 Jan 2023 20:16:10 -0600 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [FHPcQXnBSXYmAj+hG5D4+478JXgzQLDQbnUzuMsEvugf2Jy4Dgt8nx1tG/SFcUta] X-ClientProxiedBy: DS7PR03CA0293.namprd03.prod.outlook.com (2603:10b6:5:3ad::28) To MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) X-Microsoft-Original-Message-ID: <20230127021610.1152815-1-jakeleporte@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR20MB2605:EE_|SJ2PR20MB5951:EE_ X-MS-Office365-Filtering-Correlation-Id: cff05793-25bc-4d21-9b7b-08db000c7cef X-MS-Exchange-SLBlob-MailProps: V85gaVfRD48QlrK4BtQjh696yD7nFlL/1PhUwHqldCPHDA71tCzm3v9M9zQcrSDtJBhRMtLFLYDoC5BAS07sVfP34kWQgzH93XHU/dSP6VQeTcF8tVimaDUbICGy1fqO5YiAbX/Uipg0BveywEi8gCIbyXQ383ZCNN6tG3oLccwka+iho7MPcEagL6lviIrhWVQy6EStBD4d6zPGSDagyGwsYMSkDUdV+W3aKurB70+j7SJIHCrQ6+4vnRLi+S9Q6UrVCXyuK0E6x+0AKPQQch+K3S9bDfPnYu+8TDcbFDxHkHcDFWelXI/7rQzI+h18bNuj/4SCPnnL2TEjNlSW5Thuhn2WuYuVhZFv+210pk9cj7ZA+39Y934yyu798Bcrqz8ZBbrNoIY9+Ym/GQI6y6dCbbmipXdbbS8fB4amHZSNJtK5pJbyF7WOSVcd8mTQnpJYf0iYQlv4DBLwF1dpPxRijKPucCnOwlYFg7GkEt1V+sjp/8p74j18TvhFFe7pBe7keyvfDiqLQz/KUOxVQD1av13y60lPnbpr86d2ZRXG6I5af7uGkQmIgBbJmj47sKzAfIl5ZJfn+kThXrV8VTneJ++F+kdrHvurCrodFc9wLZqbOmQzjX1RnbbJI7zQedsTPtsVv/yPzEQMbDLZKEpggmg8SqvDwWBP42cTivCWQ+SSKE9nC10Eu212gaNNCFHf69ctP9Tmv7fXbGiXndM+WSHwpGTM83niUjFH1LUUgeBzB59Ca27lOTWHp7Ubc2GbfmacQ1HS9e4DOU9N3m1HigDrdB8Lw84RTNNeyJg3IRJ0ijazrMmuMIJMZddAq9ZSnp/1uXzPkjT0NSMxkQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U6rUWShS07M3WkuAsYAvs1fFu4xTuCzSj5mqv/iNDQtpzPjsgVkw03/ygKc3jV/+r2ERgUbNagEuWPracPez0HXVzOTL8bG1/jrQjtfbkqJVYcbvu7HAebvD2w7kHWfFflOAapW1vuuzFOJIkATAJKAmW9xmO3gNquzCKFmMgLSQr+gWcDH5zOQVmukXsO59eaxN7KP832Tcsu5xRr4tHKS8nyylypObp/pOsKpvMJnAZphWaVEfgVTmfpos5vPcW+How/fUM9Y2ePr4q4NRVws/+BeSXu4sdOigKSEkB2I3y9Hb/pBvgtfLi8hbGlMB2nKrwJBzsLewcfbkZsaMzGiPXib9O2CN1q1A3ZmMbDMX/Sjee30dRlNCMahu3qWcHS494iA5Bo+M/8QKzfOM5qUSSBADVOtIiUwRBDMcU0ZA5UacJgebqIY/2MCnQWNekQHoTuWIHyS6gD7oFmZ1xIYDozDGxybbWeLDyk6bHcbOwor3WSo9MnkLyrHqcGjxbMBIPgsQrUPSBegxOkn20SnJqMEaTO9V1kV9js/EcxC+kxPsBfiG8UFWIrBgdFQnO5W0BP+H2ne2lmTrPsOcqGAOl6SdGWDzrmVRICLM+AWRWrLFNAylL+rFqWROHMy9lbowCet7aLDi9IxR2Bzg+M3beSpK1KmuNzqufhsccimKXcbsK+9pcDS4sLWmzdtu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /FCSNhLbeUH7WDRcfXX5hxN4tJccg1vTpWLbHfITGU/Yw/yLkJgUEDHOwFeH6g/IM7moabta8YMWQQk2IizAVWPlhOzG6Z7Tso0B6hNvkzypwCw494vpj05YuSZyPvsFsHqaIP/NeZU68h0LD+kqsCyC3GVb4/Np4oiMcBBNpJeZYBa2tTzz7I3ZziepkmXw7QQHoU85J0KH0Bly28nuT292STzhWH9gcTa6z4w8xYqgQtpixG/8slMfomy4NCL7LOqPOr7Xrx+t1djb7AzuohG4BaHHVo8hj2WmtWfrgfhDfImdVBVUdA9J4XTTs6L4jl3qErCqc00sGDrARDE5R7+TddXSQ3ggLUNTh4nl6vJGWf4l1eRzCnZ3OU115Xw6agpCy8ZLfBGEBXr0lASN0LYzYnMnc9KjSIlkqavQROxsX3iYnPOmslPUUefrF8w/t+Uu0L/Wwf1Roc14h5fvjJYMslumdTk0NXhyJGYfYQkBAojE9ZPFhHimYOuAXqUACtFTJ3L54JtGHQ7U7QXj1R5SgQDVrr3wxjY/BansjVabiexh6yR4P883EgGVgoLx+HrYF8K8yhw6IxK9bqHPAYhXxSc9qWlaT7Ouxiy5sNv8umNWys607HUP6CXTJRTz/hldRT9r7SS5q/6F10UK8bRZvKHr+f6F4PrkwlFvqY0LyLg3Q9kC3a2VQkmuLhIfj+gUsVDez8CM7kNLpSo5b/0o6PteEUoWAJDdjZly/+PCbzZVlvghQlIr5mpiPalo+b9GJkXg5SxJBg3zLaXJDSI8A+JfUWwjqyh2an7aT+L2UDKhl2Kf5f8CXcqeahq8SQVYLobmPmk4fXlEQDHoLH/yrwPNW4ITVnT8C3dIiVU12fikgWwtGLsbJEni1VU9LRcZ7zix5Qu7oBPsimRwCdlk43l1UqCIZBMFWhEoQbm8ce5UYRilnXTSGAk+D6IoH5+JCf+2c9N5g1HpifAMB3dxQ0DDWxEVUY0zEdYoF5G70kd90aVL7xWjrRvvgq9ddqUcnI/CBzRIt+AuW3Ej4G+EASv9fBjG9jCSF+em4P08WnZt9Qy/rJemmLjyOZuPiAHyUpY6ZDWrBXLWXWySIonA1KsYhkTOVsKiRxpncynvIuarSDcQjrOf8848L+0j9V5+tguSSuf+yj83XGoh7JK7nkSjYj9ug148tPxxiwMJEtHZaCEzVdQSxEk6AKYoi8uCGutlXkS2CmeBflPrYc/4E7I9gW/2ha2unIQtqx1xHKrzbPMSX11nss9zH5lwvqbqpehEchZMQr2WzNuinmQArUo3l9GN5rfAqaHSxhzoSPsDmUEka+fFrreMN54BCdYo7Fu1zFfFeywdf/vw4foIHZs654Q3IyE9klQk444= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cff05793-25bc-4d21-9b7b-08db000c7cef X-MS-Exchange-CrossTenant-AuthSource: MN2PR20MB2605.namprd20.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 02:16:24.9054 (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: SJ2PR20MB5951 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 Ok, got it. I also misunderstood wrap-program before, and I've now updated the patch to properly wrap the perl script and avoid unnessecarily propagating inputs. * gnu/packages/maths.scm (dozenal): New variable. --- gnu/packages/maths.scm | 105 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) base-commit: 2b1e5cb6a82e60298b620ef8d2dbf90cfb925015 prerequisite-patch-id: 55ebfdbee35b36ac06da23b716337ecfef350452 prerequisite-patch-id: 12b9437ce6c6849e83e52cabad56672a5c73e2a7 prerequisite-patch-id: 52c97b6e4d8d4b78217423a3f1323d95a609de8c diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d9bc292..4b4c195 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")