From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WFMNH7JdGmQzGQEASxT56A (envelope-from ) for ; Wed, 22 Mar 2023 02:45:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MOZIHrJdGmQpmAAAG6o9tA (envelope-from ) for ; Wed, 22 Mar 2023 02:45:22 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 346191FFDF for ; Wed, 22 Mar 2023 02:45:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1penXE-0003xI-JK; Tue, 21 Mar 2023 21:45:04 -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 1penXD-0003ww-1P for guix-patches@gnu.org; Tue, 21 Mar 2023 21:45:03 -0400 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 1penXC-0001Yz-NH for guix-patches@gnu.org; Tue, 21 Mar 2023 21:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1penXC-0003vd-Hw for guix-patches@gnu.org; Tue, 21 Mar 2023 21:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60827] [PATCH 0/3] Add perl-par, xforms, and dozenal package definitions Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 01:45:02 +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: Jake Leporte Cc: 60827@debbugs.gnu.org Received: via spool by 60827-submit@debbugs.gnu.org id=B60827.167944947215038 (code B ref 60827); Wed, 22 Mar 2023 01:45:02 +0000 Received: (at 60827) by debbugs.gnu.org; 22 Mar 2023 01:44:32 +0000 Received: from localhost ([127.0.0.1]:33027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1penWh-0003uR-U2 for submit@debbugs.gnu.org; Tue, 21 Mar 2023 21:44:32 -0400 Received: from mail-qv1-f47.google.com ([209.85.219.47]:43892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1penWe-0003uA-Sk for 60827@debbugs.gnu.org; Tue, 21 Mar 2023 21:44:29 -0400 Received: by mail-qv1-f47.google.com with SMTP id jl13so11339971qvb.10 for <60827@debbugs.gnu.org>; Tue, 21 Mar 2023 18:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679449463; h=content-transfer-encoding:mime-version:message-id:date:user-agent :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6kjrMVi9EWx3Ryzntt1iQtK/36HWF/hksXLhfMGmEr8=; b=RNB+hoMBzWvt15jh4TcJnQOyYfVwG439Zq+Od2hMwAhx8CD/g/noN01AiK1xj+W9sx eye5h0To95rOblxO9s+9ZQIrv+7AF3qjndZFB+67DABKIXuFanWc6lLGYmMKEw4EbsAD yck65uLWlief9iEVtivScar75UkGbcMiCyzDnYazAruhvHbZgktJ3pChWFRy4Mq/yaTY s4YVG2548YHEUzUCrdaDwtMnE5X+IgelMg2EBcUSC4MxAUl/EOGKAoL0QDoZYn4Ny7eO GKyIeRM2XPBtspGyuk6YkUNNJZhXn8dDDYTqfy7rw+BP9zhqke9QTF84kFNpnNLgE/yL GoUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679449463; h=content-transfer-encoding:mime-version:message-id:date:user-agent :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6kjrMVi9EWx3Ryzntt1iQtK/36HWF/hksXLhfMGmEr8=; b=vRAbiFd76F39GByxy2+TmYAoCaosgDx0GXbiKcZ1vu5mhWx0QFOjntPHXc+/qKIdBA CcyXXjHfofO/Uztb8sbh666SFO43RoEknKAFhDxzUjSu0UXByI/fGVigyYev8g6aXgdn cK6cAWs7AtqjisNKeq+uULEglSwZvI7+q71/6QWnjlQIy44lMsG6YJyN2ryVmWmTWBFz Z5QG+BKHgBfgiX7n4sBs5tIUdKol45kaOhGgyMnuJiIUZHr+WHJpkpcD0/Uf68BkbpzP Z+yw4UsFdoAOy6DsiykxyFjwSB8cfsRBbg7eFa+IgngrEIQaiSaPA0AglNbLT73mmmj+ Sbpg== X-Gm-Message-State: AO0yUKWG6CmKddmaRBBlaH4gGOLc1qH+XfEVjV5DsRba21ocXzrzEM2E eMDbMZcYpEFnoDgiib2BX3+eOTM+AxHbuw== X-Google-Smtp-Source: AK7set8eSa9r9wADBDmExf5sUh0PHThjgcZ9pzG5MndObPJFVtpY4k1knayJINKNjitvqoGBeHRGDA== X-Received: by 2002:a05:6214:c88:b0:5bb:eefc:1624 with SMTP id r8-20020a0562140c8800b005bbeefc1624mr3132849qvr.27.1679449463011; Tue, 21 Mar 2023 18:44:23 -0700 (PDT) Received: from hurd (dsl-10-130-195.b2b2c.ca. [72.10.130.195]) by smtp.gmail.com with ESMTPSA id r20-20020a37a814000000b00746ae84ea6csm221372qke.3.2023.03.21.18.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 18:44:22 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: (Jake Leporte's message of "Mon, 6 Mar 2023 06:47:56 -0600") References: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) Date: Tue, 21 Mar 2023 21:44:21 -0400 Message-ID: <87fs9xk1ai.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679449522; a=rsa-sha256; cv=none; b=cf1S02sdv4zMZwBdynusVRQggAY3ndIcjKa4zHxIW3T6QEdxXbVjJiBWhhShhFejkhs+y2 q2gBSZy7IxQN1dHgEGMO+HnqDCncHj5SOD/dCdjSxAwFtDHQMmm7H2ygOFAdb94ycYkx/R 4cKzKsbZdiI5XvG3fnSc9/k1IZ1XHim0kobWyrVc/bigzblCGDer30kY7U3pXVqipOt3ff dHLfZlLrTd14T1pvGunBUVQCGw2mOhtUS4M5i3zAD6MI4E9ncj3EXAln7Sx2zBrwkt8Ecq rG/MAlPKStkEFIg2AkpbvxPqIPEUGLEE4RRWPMeZLWny3I7jdpnKIqO6jj5+jw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=RNB+hoMB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679449522; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=6kjrMVi9EWx3Ryzntt1iQtK/36HWF/hksXLhfMGmEr8=; b=O8bfKeE9023CZpiHMJu66aJh/FxL8n72NfqMXGODW75kTiY2+WKjPfmJm7wwAzywdT1s6Y +WE9+NPz2mBBWWKXaNe8Z/5byMfTvPjMyHMgQpzF8hMStfgUtJ4G50cjwQeyQSNYRL0H8Y CmhEkY7QX8noW3LstujMentOj48nY9GE08psFh6QZnNzrbnqBio337EjuwU142IhlqoqVT Qfv1w+h/nGIfGoyUa4ZcV9nMRYGsmbe9XXMwaSeVdNRfY3H5lE2jx7mm9bWVndRC/sEoKo 0ZkK2saIUqZvN9Kj+bDNQKqxKqNw1a9QGo+uWRBJs10bDGgvntaOJRkTsLENwQ== X-Migadu-Spam-Score: 5.75 X-Spam-Score: 5.75 X-Migadu-Queue-Id: 346191FFDF Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=RNB+hoMB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: jEBPBhatOWnc Hi, Jake Leporte writes: > * gnu/packges/perl.scm (perl-par): New variable. > --- > gnu/packages/perl.scm | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) Thank you for your contribution! I've now installed the four changes, with the modifications below: for perl-par, I've added your copyright: --8<---------------cut here---------------start------------->8--- modified gnu/packages/perl.scm @@ -36,6 +36,7 @@ ;;; Copyright =C2=A9 2022 gemmaro ;;; Copyright =C2=A9 2023 M=C4=83d=C4=83lin Ionel Patra=C8=99cu ;;; Copyright =C2=A9 2023 Andreas Enge +;;; Copyright =C2=A9 2023 Jake Leporte ;;; ;;; This file is part of GNU Guix. ;;; --8<---------------cut here---------------end--------------->8--- for xforms, I've added a trailing period to the comment, corrected the version to "1.3.0" which was the latest release, and reworded the description a bit. --8<---------------cut here---------------start------------->8--- modified gnu/packages/xdisorg.scm @@ -58,6 +58,7 @@ ;;; Copyright =C2=A9 2022 Wamm K. D. ;;; Copyright =C2=A9 2022 Tobias Kortkamp ;;; Copyright =C2=A9 2023 Yovan Naumovski +;;; Copyright =C2=A9 2023 Jake Leporte ;;; ;;; This file is part of GNU Guix. ;;; @@ -3451,13 +3452,13 @@ (define-public wvkbd license:gpl3+)))) ;the rest is GPLv3+ =20 (define-public xforms - ;; The latest stable release fails with a linker error, so use an updated - ;; version + ;; The latest stable release is ancient (2014) and fails with a linker + ;; error, so use the last commit. (let ((revision "1") (commit "2c1a9f151baf50887a517280645ec23379fb96f8")) (package (name "xforms") - (version (git-version "1.2.4" revision commit)) + (version (git-version "1.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3488,8 +3489,8 @@ (define-public xforms (home-page "http://xforms-toolkit.org/") (synopsis "GUI toolkit for X based on the X11 Xlib library") (description - "XForms is a graphical user interface toolkit for X based on the X1= 1 Xlib -library. I.e., it allows you to create windows, containing all kinds of + "XForms is a graphical user interface toolkit for X based on the X11 +Xlib library. It allows you to create windows, containing all kinds of widgets (buttons, sliders, browsers, menus etc.) with a few lines of code = and then attach actions to the widgets, i.e., have some function called when a button is pressed. To make this even easier XForms comes with a program --8<---------------cut here---------------end--------------->8--- for xforms-gl, I've used package/inherit, which on top of inheritance confers the same replacement properties when there are grafts. This is to be used for variant packages that build from the same source code. --8<---------------cut here---------------start------------->8--- modified gnu/packages/xdisorg.scm @@ -3499,8 +3499,7 @@ (define-public xforms (license license:lgpl2.1+)))) =20 (define-public xforms-gl - (package - (inherit xforms) + (package/inherit xforms (name "xforms-gl") (propagated-inputs (modify-inputs (package-propagated-inputs xforms) (append mesa))) --8<---------------cut here---------------end--------------->8--- and for dozenal, I've used the 'this-package-input' procedure recommended by another reviewer, re-flowed the paragraphs to use a width of 80 characters, used rename-file instead of copy-file + delete-file and sorted the inputs. --8<---------------cut here---------------start------------->8--- 1 file changed, 24 insertions(+), 30 deletions(-) gnu/packages/maths.scm | 54 ++++++++++++++++++++++++-----------------------= ------- modified gnu/packages/maths.scm @@ -59,6 +59,7 @@ ;;; Copyright =C2=A9 2022 Maximilian Heisinger ;;; Copyright =C2=A9 2022 Akira Kyle ;;; Copyright =C2=A9 2022 Roman Scherer +;;; Copyright =C2=A9 2023 Jake Leporte ;;; ;;; This file is part of GNU Guix. ;;; @@ -463,6 +464,7 @@ (define-public dionysus (home-page "https://www.gnu.org/software/dionysus/"))) =20 (define-public dozenal + ;; There is no recent release, so use the latest commit. (let ((revision "1") (commit "328bc03ad544179f2cccda36763358c4216f188e")) (package @@ -482,13 +484,12 @@ (define-public dozenal (arguments (list ;; Some test scripts are included, but no makefile-driven - ;; tests, and they are all quite manual to run and check + ;; 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. + ;; 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=3D" #$output)) @@ -499,7 +500,8 @@ (define-public dozenal (chdir "dozenal"))) (add-after 'chdir 'patch-lua-references (lambda _ - (let ((lua-name (strip-store-file-name #$lua))) + (let ((lua-name (strip-store-file-name + #$(this-package-input "lua")))) (substitute* '("dozcal/Makefile" "dozlua/Makefile") (("lua52") @@ -527,40 +529,32 @@ (define-public dozenal "/share/man/man1/" prog ".1"))) (mkdir-p (dirname dst)) - (copy-file orig dst) - (delete-file orig) + (rename-file orig dst) (mkdir-p (dirname man-dst)) - (copy-file man-orig man-dst) - (delete-file man-orig))) + (rename-file man-orig man-dst))) '("xdozdc" "gdozdc")) - (wrap-program - (string-append #$output:gui "/bin/" "gdozdc") - `("PATH" =3D - (,(string-append #$output "/bin"))) - `("PERL5LIB" =3D - (,(getenv "PERL5LIB"))))))))) + (wrap-program (string-append #$output:gui "/bin/" "gdozdc") + `("PATH" =3D (,(string-append #$output "/bin"))) + `("PERL5LIB" =3D (,(getenv "PERL5LIB"))))))))) (outputs '("out" "gui")) (native-inputs (list groff pkg-config)) - (inputs (list bash-minimal ;since wrap-program is used - ncurses + (inputs (list bash-minimal ;for wrap-program libhdate lua + ncurses perl perl-tk perl-par xforms)) - (synopsis - "Suite of dozenal programs, including converters, a calculator, and= date -program") + (synopsis "Suite of dozenal programs") (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.") + "The dozenal suite is a set of programs designed to assist with wor= king +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 progr= ams, +complete with events and to-dos.") (home-page "https://codeberg.org/dgoodmaniii/dozenal") (license license:gpl3+)))) --8<---------------cut here---------------end--------------->8--- Thanks again, --=20 Maxim