From patchwork Mon Jul 24 15:31:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 52165 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 C13E827BBEA; Mon, 24 Jul 2023 16:33:16 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 CDDB627BBE2 for ; Mon, 24 Jul 2023 16:33:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNxYX-0003Oq-GF; Mon, 24 Jul 2023 11:33:06 -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 1qNxYU-0003NX-G5 for guix-patches@gnu.org; Mon, 24 Jul 2023 11:33:02 -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 1qNxYU-0003cO-8E for guix-patches@gnu.org; Mon, 24 Jul 2023 11:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNxYU-00034L-3Z for guix-patches@gnu.org; Mon, 24 Jul 2023 11:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64688] [PATCH v3] gnu: Add calc. References: <87edl6bctv.fsf@riseup.net> In-Reply-To: <87edl6bctv.fsf@riseup.net> Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 15:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64688 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64688@debbugs.gnu.org Cc: andreas@enge.fr, Distopico Received: via spool by 64688-submit@debbugs.gnu.org id=B64688.169021276911774 (code B ref 64688); Mon, 24 Jul 2023 15:33:02 +0000 Received: (at 64688) by debbugs.gnu.org; 24 Jul 2023 15:32:49 +0000 Received: from localhost ([127.0.0.1]:43808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxYH-00033q-0p for submit@debbugs.gnu.org; Mon, 24 Jul 2023 11:32:49 -0400 Received: from mx0.riseup.net ([198.252.153.6]:49726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxYD-00033b-MW for 64688@debbugs.gnu.org; Mon, 24 Jul 2023 11:32:47 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4R8kgX1Rpyz9tHf; Mon, 24 Jul 2023 15:32:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690212760; bh=LGLtsLQ+eawBlmwS0NdSbtruGK/toTkNuZ1Nre4ZKmA=; h=From:To:Cc:Subject:Date:From; b=bb+ZYRXkbGxj52D20EgPc8BNrXYAtSD+ft4QTYfg9mQ1KD097/skRYtkXqF9SosdE AmB5QwsyNMX6BSb1BMKq0BRt2MxIXMSBcwA0twUHaY6BwjTFbREk8nEBhvq/Dmjcg9 Nq2FQAj/dj0QnXn4DyemkuaDP/ESeI9wBx29t0s4= X-Riseup-User-ID: 661F2646A1433BBD54664DA14633D0AFA304B5171C38B30AFFC24E1BEB47396D Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4R8kgW2J5rzFpgy; Mon, 24 Jul 2023 15:32:39 +0000 (UTC) From: Distopico Date: Mon, 24 Jul 2023 10:31:24 -0500 Message-ID: <20230724153210.12545-1-distopico@riseup.net> 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: , 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 (calc): New variable. --- Change make-flags to use gexp and remove unncesary output gnu/packages/maths.scm | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b9b63c81c1..9c0c98db56 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2022 Akira Kyle ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2023 Jake Leporte +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -261,6 +262,55 @@ (define-public c-graph (license license:gpl3+) (home-page "https://www.gnu.org/software/c-graph/"))) +(define-public calc + (package + (name "calc") + (version "2.14.1.6") + (source (origin + (method url-fetch) + (uri (string-append "http://www.isthe.com/chongo/src/calc/calc-" + version ".tar.bz2")) + (sha256 + (base32 + "0h3zsqwpbwddv28khg1fk00ydk6sxvdig085lvi1s63d544b6nff")))) + (build-system gnu-build-system) + (inputs (list readline)) + (native-inputs (list util-linux)) + (arguments + (list + #:make-flags #~(list "DEBUG=" + "USE_READLINE=-DUSE_READLINE" + "READLINE_LIB=-lreadline" + "READLINE_EXTRAS=-lhistory -lncurses" + (string-append "DEFAULT_LIB_INSTALL_PATH=" #$output + "/lib") + (string-append "T=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-makefile-ldflags + (lambda _ + (substitute* "Makefile" + (("\\$\\{CC\\}\\s+\\$\\{LIBCALC_SHLIB\\}") + "${CC} ${LDFLAGS} ${LIBCALC_SHLIB}")) + (substitute* "custom/Makefile" + (("\\$\\{CC\\}\\s+\\$\\{LIBCUSTCALC_SHLIB\\}") + "${CC} ${LDFLAGS} ${LIBCUSTCALC_SHLIB}")))) + (add-before 'build 'patch-makefile-prefix + (lambda _ + (substitute* "Makefile" + ;; Replace because there is more or less + ;; 5 Makefile vars with /usr as default prefix + (("=\\s?/usr/") + "= /"))))))) + (synopsis "Arbitrary precision console calculator") + (description + "Calc is an arbitrary precision arithmetic system that uses a C-like language, +It's useful as a calculator, an algorithm prototyper and as a mathematical research tool. +More importantly, calc provides one with a machine independent means of computation. +Calc comes with a rich set of builtin mathematical and programmatic functions.") + (home-page "http://www.isthe.com/chongo/tech/comp/calc/") + (license license:lgpl2.1))) + (define-public coda (package (name "coda")