From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 17 14:41:32 2023 Received: (at submit) by debbugs.gnu.org; 17 Jul 2023 18:41:32 +0000 Received: from localhost ([127.0.0.1]:50913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLTA4-0005Lt-6k for submit@debbugs.gnu.org; Mon, 17 Jul 2023 14:41:32 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLTA1-0005Lf-Cy for submit@debbugs.gnu.org; Mon, 17 Jul 2023 14:41:30 -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 1qLT9v-0005Xl-Bv for guix-patches@gnu.org; Mon, 17 Jul 2023 14:41:23 -0400 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLT9t-0007Qd-Oy for guix-patches@gnu.org; Mon, 17 Jul 2023 14:41:23 -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 4R4WBR6BVmz9tJq for ; Mon, 17 Jul 2023 18:41:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1689619280; bh=qZgtsvt/Pyv/KKPLox/KoOzJeopOYRfZ5PYDOblGtFI=; h=From:To:Subject:Date:From; b=KcYd0uh4ZO9B7niRDLt0bl5IElrRyuAO5gdAbbpERKzu/g5nHlyOY3WlPwk/8/77v Vw3uphPtk2lCJUuQ9AB3P/S3LAVo7neiGUusEYEzs2J5TaceJPfkZFw0y170U9947t 48kmgPSenrBlRJEKNwPlqQjPppwMVlXFKlcbjFZM= X-Riseup-User-ID: 8091CDA857C113CD26B6A2FBF1D7048763A5862958C04A52FCB570FE0E45BCBA Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4R4WBQ2QRpzFs0H for ; Mon, 17 Jul 2023 18:41:18 +0000 (UTC) From: Distopico To: guix-patches@gnu.org Subject: [PATCH] gnu: Add calc. Date: Mon, 17 Jul 2023 13:36:13 -0500 Message-ID: <87edl6bctv.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=198.252.153.6; envelope-from=distopico@riseup.net; helo=mx0.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Adds `calc` package, an console calculator and mathematical tool. * gnu/packages/maths.scm (calc): New variable. --- gnu/packages/maths.scm | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b9b63c81c1..c5e0da4328 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -60,6 +60,7 @@ ;;; Copyright =C2=A9 2022 Akira Kyle ;;; Copyright =C2=A9 2022 Roman Scherer ;;; Copyright =C2=A9 2023 Jake Leporte +;;; Copyright =C2=A9 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -261,6 +262,63 @@ (define-public c-graph (license license:gpl3+) (home-page "https://www.gnu.org/software/c-graph/"))) =20 +(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/ca= lc-" + version ".tar.bz2")) + (sha256 + (base32 + "0h3zsqwpbwddv28khg1fk00ydk6sxvdig085lvi1s63d544b6nff")))) + (build-system gnu-build-system) + (inputs (list readline)) + (native-inputs (list util-linux)) + (outputs '("out")) + (arguments + '(#:make-flags (let ((out (assoc-ref %outputs "out"))) + (list "DEBUG=3D" + "USE_READLINE=3D-DUSE_READLINE" + "READLINE_LIB=3D-lreadline" + "READLINE_EXTRAS=3D-lhistory -lncurses" + (string-append "DEFAULT_LIB_INSTALL_PATH=3D" o= ut + "/lib") + (string-append "T=3D" out))) + #: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-guixnization + (lambda _ + (for-each (lambda (file) + (substitute* file + (("(open source|open software)") + "Free Software"))) + (list "calc.c" "version.c" "calc.man")))) + (add-before 'build 'patch-makefile-prefix + (lambda _ + (substitute* "Makefile" + ;; Replace becase there is more or less + ;; 5 Makefile vars with /usr as default prefix + (("=3D\\s?/usr/") + "=3D /"))))))) + (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 co= mputation. +Calc comes with a rich set of builtin mathematical and programmatic functi= ons.") + (home-page "http://www.isthe.com/chongo/tech/comp/calc/") + (license license:lgpl2.1))) + (define-public coda (package (name "coda") --=20 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 18 07:30:19 2023 Received: (at 64688) by debbugs.gnu.org; 18 Jul 2023 11:30:19 +0000 Received: from localhost ([127.0.0.1]:51730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLiuI-0007b4-Pu for submit@debbugs.gnu.org; Tue, 18 Jul 2023 07:30:19 -0400 Received: from mx1.riseup.net ([198.252.153.129]:42826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLiuE-0006ws-AL for 64688@debbugs.gnu.org; Tue, 18 Jul 2023 07:30:16 -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) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4R4xZR23sSzDqxG for <64688@debbugs.gnu.org>; Tue, 18 Jul 2023 11:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1689679807; bh=JtCRF0g7xZhZ3OV86hm+yYMXAfE0Pd5HIfKMgaut+gw=; h=From:To:Cc:Subject:Date:From; b=GFbpIpFNJZSXt/AWtM7AqKXxMeywJcNE50CBeQcRr/6KOR5VP99jUMx/qsdbSPZBZ ydNQb46+W24SlLh1BLpG5RUmiu3UOWAgsVhS3lRqAuh+j/F/SYaoyt6bliJl1MTllW j5Wx8L4pfyxDX/doEC7SWRMRuidOAvVPU+ZYcN2E= X-Riseup-User-ID: F2979B6E713B15178821F9B750B9475977A5476AE3AEC36E63CCC8D630B78849 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4R4xZQ4R5pzFqPN; Tue, 18 Jul 2023 11:30:06 +0000 (UTC) From: Distopico To: 64688@debbugs.gnu.org Subject: [PATCH v2] gnu: Add calc. Date: Tue, 18 Jul 2023 06:28:14 -0500 Message-ID: <20230718112911.31050-1-distopico@riseup.net> MIME-Version: 1.0 X-Debbugs-Cc: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 64688 Cc: Distopico X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/maths.scm (calc): New variable. --- Remove unnecesary open/libre substitute. gnu/packages/maths.scm | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b9b63c81c1..a8ddf0a514 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,56 @@ (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)) + (outputs '("out")) + (arguments + '(#:make-flags (let ((out (assoc-ref %outputs "out"))) + (list "DEBUG=" + "USE_READLINE=-DUSE_READLINE" + "READLINE_LIB=-lreadline" + "READLINE_EXTRAS=-lhistory -lncurses" + (string-append "DEFAULT_LIB_INSTALL_PATH=" out + "/lib") + (string-append "T=" out))) + #: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 becase 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") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 23 17:57:41 2023 Received: (at 64688) by debbugs.gnu.org; 23 Jul 2023 21:57:41 +0000 Received: from localhost ([127.0.0.1]:41332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNh59-0000Tn-5g for submit@debbugs.gnu.org; Sun, 23 Jul 2023 17:57:40 -0400 Received: from mx0.riseup.net ([198.252.153.6]:32812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNh54-0000TW-3f for 64688@debbugs.gnu.org; Sun, 23 Jul 2023 17:57:37 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (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 4R8HG00L93z9s8c for <64688@debbugs.gnu.org>; Sun, 23 Jul 2023 21:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690149448; bh=+cttq2eLQTda230py9LrsVYiSWqDfyw+YhQltEjRCFU=; h=From:To:Cc:Subject:Date:From; b=J+mxHHiBLf9BtAbqh909bikmY/Zglwqm+UxVkr90OvQPHHyY0JnmvwbYbFKx/xz6t jKyJW6cv/BCvPitQw9TjXp27+/a4WHYdBlsgGRJwTGsCe8AGmy+4YO0kxJcXX7ifbG 85OSDb1iTim2nwM+T8o9a9SPFqqQr6iup3Pvndmg= X-Riseup-User-ID: 8B9C85A7626C790BACF7C8BC047B4AEE708E175359D0D5344547B378ECCAA580 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4R8HFz25F1zJnJW; Sun, 23 Jul 2023 21:57:26 +0000 (UTC) From: Distopico To: 64688@debbugs.gnu.org Subject: [PATCH v3] gnu: Add calc. Date: Sun, 23 Jul 2023 16:52:23 -0500 Message-ID: <20230723215710.2037-1-distopico@riseup.net> MIME-Version: 1.0 X-Debbugs-Cc: paren@disroot.org, mail@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 64688 Cc: Distopico X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/maths.scm (calc): New variable. --- Fyx typo gnu/packages/maths.scm | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b9b63c81c1..3937e9118a 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,56 @@ (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)) + (outputs '("out")) + (arguments + '(#:make-flags (let ((out (assoc-ref %outputs "out"))) + (list "DEBUG=" + "USE_READLINE=-DUSE_READLINE" + "READLINE_LIB=-lreadline" + "READLINE_EXTRAS=-lhistory -lncurses" + (string-append "DEFAULT_LIB_INSTALL_PATH=" out + "/lib") + (string-append "T=" out))) + #: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") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 24 11:28:38 2023 Received: (at 64688) by debbugs.gnu.org; 24 Jul 2023 15:28:38 +0000 Received: from localhost ([127.0.0.1]:43804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxUE-0002wB-Cl for submit@debbugs.gnu.org; Mon, 24 Jul 2023 11:28:38 -0400 Received: from mx0.riseup.net ([198.252.153.6]:40242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxU9-0002vs-5E for 64688@debbugs.gnu.org; Mon, 24 Jul 2023 11:28:36 -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 4R8kZg1j2Hz9tDM; Mon, 24 Jul 2023 15:28:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690212507; bh=uztyay9izTnYtr3QLhFtJazkqlkgS0fc0ue0z4zBpFg=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=TNMo/yEw4ImmhOdpCnVrbD+FH+OC81NZnEOS3f4wr/vzH8g6/y5jIYYmfC+uxnkkG o7NZ77V1t+OKnvkhY/k/8w/pDtTOk//I5CJiqw8EvUeIEU+PMSFFZf7xRNoZT79uvL i3VIw/3Akz4LbZ93Ts8WjdNgm8PxPC122V6XccWs= X-Riseup-User-ID: AABB14080E813DF88FE1BDF493CA32830CF17B556FCA3C95E31A21F6C2C14B8D Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4R8kZf3GwQzFpgy; Mon, 24 Jul 2023 15:28:26 +0000 (UTC) References: <87edl6bctv.fsf@riseup.net> <20230718112911.31050-1-distopico@riseup.net> From: Distopico To: 64688@debbugs.gnu.org Subject: Re: [bug#64688] [PATCH v2] gnu: Add calc. Date: Mon, 24 Jul 2023 10:27:52 -0500 In-reply-to: Message-ID: <87lef5nxbb.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 64688 Cc: Andreas Enge X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-07-24, Andreas Enge wrote: > Hello, > > just a few quick comments, as I do not have the time to look at the > package in detail. > > Am Tue, Jul 18, 2023 at 06:28:14AM -0500 schrieb Distopico: >> + (outputs '("out")) Done, removed > > This is the default and can thus be dropped. > >> + '(#:make-flags (let ((out (assoc-ref %outputs "out"))) > > This should probably be done with a gexp nowadays, but I do not know how; > I suppose there are examples to look up. > Changed, thank you >> + (add-before 'build 'patch-makefile-prefix >> + (lambda _ >> + (substitute* "Makefile" >> + ;; Replace becase there is more or less >> + ;; 5 Makefile vars with /usr as default prefix >> + (("=3D\\s?/usr/") >> + "=3D /"))))))) > > This is strange. The Makefile sets a variable PREFIX, but later uses > things like > BINDIR=3D /usr/bin > except for MacOS, where it uses > BINDIR=3D ${PREFIX}/bin > This line even appears in the general case, but is commented out, which > makes no sense. > > Maybe this could be discussed with upstream? It is also like this in the > latest release 2.14.2.0. > Yeah, maybe, not big fan of github but I'll try to contact upstream in other way, =C2=BFit would be a blocker to add this patch to guix? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFJBAEBCAAzFiEEvYwofabWO6y953lVmAk6gHJUa/MFAmS+mJgVHGRpc3RvcGlj b0ByaXNldXAubmV0AAoJEJgJOoByVGvzxSgH/jji9PN5vGzxyPmCs2H07nXZC/0W IHtO8oDTnIRLjQlCfHiWgSprmQp1eGAWtgyYtJeE8Z6UqGjK4NLK9pj0jgQ7VnuD PDngzzLE8fkjBHQsHtWTrqVMVxpjj0XLjUF9xzxDZzQXI9bOsGRW9RIkLRN8iSyk lMdAEVkRaIvTz67ps0AR6nU5nM/A6w7T5/YViXVjXCt0w2TUMslBpgFpnVdZMet7 R9vulRVmrsebOHVwCO51oNHDL87tKqUHa/8XKxKP47G0FKfM7oZ1aX6NsouDD7// qK8JT6uj0vIi/I/ITREgpp+rd3wTwZOBAmmCqHcZdot1niY09XhIxl3EeAg= =1C/d -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 24 11:32:49 2023 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 To: 64688@debbugs.gnu.org Subject: [PATCH v3] gnu: Add calc. Date: Mon, 24 Jul 2023 10:31:24 -0500 Message-ID: <20230724153210.12545-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 64688 Cc: andreas@enge.fr, Distopico X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 26 05:52:41 2023 Received: (at 64688) by debbugs.gnu.org; 26 Jul 2023 09:52:41 +0000 Received: from localhost ([127.0.0.1]:47586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qObCC-0007yb-Lo for submit@debbugs.gnu.org; Wed, 26 Jul 2023 05:52:41 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:43616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qObC8-0007yL-83 for 64688@debbugs.gnu.org; Wed, 26 Jul 2023 05:52:38 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 285B81AD5; Wed, 26 Jul 2023 11:52:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1Jl3-ixMIBbN; Wed, 26 Jul 2023 11:52:29 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 3352819D8; Wed, 26 Jul 2023 11:52:29 +0200 (CEST) Date: Wed, 26 Jul 2023 11:52:27 +0200 From: Andreas Enge To: Distopico Subject: Re: [PATCH v4] gnu: Add calc. Message-ID: References: <20230724153210.12545-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="FNgiGFrYkYhOjtjt" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230724153210.12545-1-distopico@riseup.net> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64688 Cc: 64688@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --FNgiGFrYkYhOjtjt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, as there has been a new stable release in the meantime, I updated to this. I also simplified the package a bit, maybe due to the new release one substitute did not apply any more, another one did not seem to be necessary regardless, and several "substitute*" on the same file can be combined into one expression. I then set PREFIX and used it in a substitution, which makes some CFLAGS unnecessary, and others are there by default in the current Makefile. Finally I made the description a bit more neutral. The resulting calc binary seems to work, if you are happy with the package, I could push it. Andreas --FNgiGFrYkYhOjtjt Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="0001-gnu-Add-calc.patch" Content-Transfer-Encoding: 8bit >From e73a154f281e81f9c2bb9c4655dada1ef7df0e48 Mon Sep 17 00:00:00 2001 Message-ID: From: Distopico Date: Mon, 24 Jul 2023 10:31:24 -0500 Subject: [PATCH] gnu: Add calc. * gnu/packages/maths.scm (calc): New variable. Co-authored-by: Andreas Enge --- gnu/packages/maths.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8c30e49d8f..dd17141c28 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,39 @@ (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.2.0") + (source (origin + (method url-fetch) + (uri (string-append "http://www.isthe.com/chongo/src/calc/calc-" + version ".tar.bz2")) + (sha256 + (base32 + "0kg7cqhq70dlj7k8mrl0dbps1yvflfhri7c1gvm9nh4g2adlkxkf")))) + (build-system gnu-build-system) + (inputs (list readline)) + (native-inputs (list util-linux)) ; for col + (arguments + (list #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-makefile + (lambda _ + (substitute* "Makefile" + (("^PREFIX= /usr/local") + (string-append "PREFIX=" #$output)) + (("=\\s?/usr") + "= ${PREFIX}"))))))) + (synopsis "Arbitrary precision console calculator") + (description + "Calc is an arbitrary precision arithmetic system that uses a C-like +language. It can be used as a calculator, an algorithm prototyper and as +a mathematical research tool, and it comes with built in mathematical and +programmatic functions.") + (home-page "http://www.isthe.com/chongo/tech/comp/calc/") + (license license:lgpl2.1))) + (define-public coda (package (name "coda") base-commit: 713dca1399cda2439af75989510f86718741a4ff -- 2.41.0 --FNgiGFrYkYhOjtjt-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 26 10:27:53 2023 Received: (at 64688) by debbugs.gnu.org; 26 Jul 2023 14:27:53 +0000 Received: from localhost ([127.0.0.1]:49764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOfUX-0001x0-7A for submit@debbugs.gnu.org; Wed, 26 Jul 2023 10:27:53 -0400 Received: from mx0.riseup.net ([198.252.153.6]:37660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOfUU-0001wf-DW for 64688@debbugs.gnu.org; Wed, 26 Jul 2023 10:27:51 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (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 4R9x7h4DWwz9sNy; Wed, 26 Jul 2023 14:27:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690381664; bh=XzQxUVdUds8HzHHLS/E8PPyz8Ek/M0wGVjO1aCwXvxg=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=YqVplLmP+lUvdRC/4r7o6zfczHPjOaJwiE4/7XClueEu/I1hvXhr9LjkpXTruUlIT utYDgmueAbf+ZfOEZzVXDRm5KjFw3/SoL6TeawgB480vQt7a4kxKF59GRtUVGqDbvT BoqY004yGrGpk/0TWgz+kdxMG+LPCe4q220y+smo= X-Riseup-User-ID: EFF256344601D9538EBDB0F392B5687AE4B2A17D8CEF8CB8C751A1765B4F3719 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4R9x7g4jKNzJnsh; Wed, 26 Jul 2023 14:27:43 +0000 (UTC) References: <20230724153210.12545-1-distopico@riseup.net> From: Distopico To: Andreas Enge Subject: Re: [PATCH v4] gnu: Add calc. Date: Wed, 26 Jul 2023 09:27:20 -0500 In-reply-to: Message-ID: <87ila63fz7.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 64688 Cc: 64688@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Tested, works fine from my side, thank you On 2023-07-26, Andreas Enge wrote: > Hello, > > as there has been a new stable release in the meantime, I updated to this. > I also simplified the package a bit, maybe due to the new release one > substitute did not apply any more, another one did not seem to be necessary > regardless, and several "substitute*" on the same file can be combined into > one expression. I then set PREFIX and used it in a substitution, which > makes some CFLAGS unnecessary, and others are there by default in the > current Makefile. Finally I made the description a bit more neutral. > > The resulting calc binary seems to work, if you are happy with the > package, I could push it. > > Andreas > > [2. text/plain; 0001-gnu-Add-calc.patch]... From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 26 10:36:10 2023 Received: (at 64688-done) by debbugs.gnu.org; 26 Jul 2023 14:36:10 +0000 Received: from localhost ([127.0.0.1]:49783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOfcY-0002HD-7z for submit@debbugs.gnu.org; Wed, 26 Jul 2023 10:36:10 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]:55700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOfcU-0002GX-Td for 64688-done@debbugs.gnu.org; Wed, 26 Jul 2023 10:36:08 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 342CC1DF3; Wed, 26 Jul 2023 16:36:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gWSqlmqdFDZx; Wed, 26 Jul 2023 16:35:59 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 9FC4C2A1; Wed, 26 Jul 2023 16:35:59 +0200 (CEST) Date: Wed, 26 Jul 2023 16:35:58 +0200 From: Andreas Enge To: Distopico Subject: Re: [PATCH v4] gnu: Add calc. Message-ID: References: <20230724153210.12545-1-distopico@riseup.net> <87ila63fz7.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87ila63fz7.fsf@riseup.net> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64688-done Cc: 64688-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Wed, Jul 26, 2023 at 09:27:20AM -0500 schrieb Distopico: > Tested, works fine from my side, thank you Excellent, pushed! Closing this bug. Andreas From unknown Sun Jun 22 07:33:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 24 Aug 2023 11:24:12 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator