From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 22:26:59 2020 Received: (at submit) by debbugs.gnu.org; 3 May 2020 02:26:59 +0000 Received: from localhost ([127.0.0.1]:54391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV4LK-0004YY-Vn for submit@debbugs.gnu.org; Sat, 02 May 2020 22:26:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:46796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV2bg-0003mR-Kf for submit@debbugs.gnu.org; Sat, 02 May 2020 20:35:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jV2bf-0003yt-TK for guix-patches@gnu.org; Sat, 02 May 2020 20:35:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_PASS, SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jV2aX-0005II-5E for guix-patches@gnu.org; Sat, 02 May 2020 20:35:43 -0400 Received: from mail-40141.protonmail.ch ([185.70.40.141]:31717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jV2aW-0005C8-Am for guix-patches@gnu.org; Sat, 02 May 2020 20:34:32 -0400 Date: Sun, 03 May 2020 00:28:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1588465710; bh=CUkC3fQ+cPgPPiSXLiPn7NNf6qQhY000w9CcIIGZZ3Q=; h=Date:To:From:Reply-To:Subject:From; b=ueouITGMwGxka3CvG94eO3sIRWy67Z9CsaYTljhDKwks+b92C0Nu9RBAtAIzCl4LP FXQTgzTQFocMyhQuTv5pwv+pVJmHmeoVmZwwpboxbnJCvKzsShxD2pY2EKsjFo1xvE rnk3Oa6hSLNGU853quEMZwynwYjmSSSvYQwfA0Ac= To: "guix-patches@gnu.org" From: Thovthe Subject: [PATCH] Package Definition for QDirStat Message-ID: <27uwM7nMqpAz-RfKtxXzIOJWs0UnmDO3vqxoqkN1VeXR7GHQJTCgM5B0f8bCMuG2y5QsbCDj_AScqxM-4c1NO5YTf-ZAg3psDt-_FC27LJI=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.141; envelope-from=Thovthe@protonmail.com; helo=mail-40141.protonmail.ch X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/02 20:34:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.70.40.141 X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sat, 02 May 2020 22:26:57 -0400 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: , Reply-To: Thovthe Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Here is a package definition for QDirStat, an excellent tool for checking what files are taking up space on your system.=C2=A0 This is my first guix module and it was made with help from Ryan Prior (github.com/sponsors/ryanprior). I have confirmed that it builds and runs on aarch64 but the only system I have available is this fairly anemic arm laptop so I haven't tested the other architectures. Suggestions, testing, questions, comments and education welcomed. >From 9e56b8c2f5602c20ee5796de7af019ef640167cb Mon Sep 17 00:00:00 2001 From: Thovthe Date: Sat, 2 May 2020 22:48:30 +0000 Subject: [PATCH] 2020-05-02 Thovthe thovthe@protonmail.com * added new package definition for QDirStat at gnu/packages/qdirstat.scm --- gnu/packages/qdirstat.scm | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 gnu/packages/qdirstat.scm diff --git a/gnu/packages/qdirstat.scm b/gnu/packages/qdirstat.scm new file mode 100644 index 0000000000..91581a206e --- /dev/null +++ b/gnu/packages/qdirstat.scm @@ -0,0 +1,46 @@ +(define-module (qdirstat) + #:use-module (gnu packages qt) + #:use-module (gnu packages compression) + #:use-module (guix build-system gnu) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + + +(define-public qdirstat + (package + (name "qdirstat") + (version "1.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shundhammer/qdirstat.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" + (string-append "PREFIX=3D" + (assoc-ref outputs "out")) + (string-append "INSTALL_PREFIX=3D" + (assoc-ref outputs "out")))))))) + + (inputs + `(("qtbase" ,qtbase))) + (native-inputs + `(("zlib" ,zlib) + ("qttools" ,qttools))) + (home-page "https://github.com/shundhammer/qdirstat") + (synopsis "Graphical disk space inspection utility") + (description + "QDirStat is a graphical application to show where your disk space ha= s +gone and to help you to clean it up. Shaded boxes represent files and fil= es +are grouped by directory structure." ) + (license license:gpl2+))) -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Tue May 05 00:01:58 2020 Received: (at 41040) by debbugs.gnu.org; 5 May 2020 04:01:58 +0000 Received: from localhost ([127.0.0.1]:34423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVom8-0005ft-AV for submit@debbugs.gnu.org; Tue, 05 May 2020 00:01:58 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:37142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVom4-0005fb-Fo for 41040@debbugs.gnu.org; Tue, 05 May 2020 00:01:43 -0400 Received: from marsh.hcoop.net ([45.55.52.66]) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1jVoly-0002CC-7P; Tue, 05 May 2020 00:01:34 -0400 Date: Tue, 5 May 2020 00:01:33 -0400 (EDT) From: Jack Hill X-X-Sender: jackhill@marsh.hcoop.net To: Thovthe Subject: Re: [bug#41040] [PATCH] Package Definition for QDirStat In-Reply-To: <27uwM7nMqpAz-RfKtxXzIOJWs0UnmDO3vqxoqkN1VeXR7GHQJTCgM5B0f8bCMuG2y5QsbCDj_AScqxM-4c1NO5YTf-ZAg3psDt-_FC27LJI=@protonmail.com> Message-ID: References: <27uwM7nMqpAz-RfKtxXzIOJWs0UnmDO3vqxoqkN1VeXR7GHQJTCgM5B0f8bCMuG2y5QsbCDj_AScqxM-4c1NO5YTf-ZAg3psDt-_FC27LJI=@protonmail.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="925712948-1314567356-1588651294=:5735" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Thovthe, On Sun, 3 May 2020, Thovthe via Guix-patches via wrote: > Here is a package definition for QDirStat, an excellent tool for > checking what files are taking up space on your system.  This is > my first guix module and it was made with help from Ryan Prior [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE To: name matches everything in local email - LCASE headers X-Debbugs-Envelope-To: 41040 Cc: 41040@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 (-) This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --925712948-1314567356-1588651294=:5735 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT Thovthe, On Sun, 3 May 2020, Thovthe via Guix-patches via wrote: > Here is a package definition for QDirStat, an excellent tool for > checking what files are taking up space on your system.  This is > my first guix module and it was made with help from Ryan Prior > (github.com/sponsors/ryanprior). I have confirmed that it builds > and runs on aarch64 but the only system I have available is this > fairly anemic arm laptop so I haven't tested the other > architectures. Suggestions, testing, questions, comments and > education welcomed. Thanks for contributing this patch to Guix! I have some suggestions for how it can be cleaned up so that it can be included in the distribution. > From 9e56b8c2f5602c20ee5796de7af019ef640167cb Mon Sep 17 00:00:00 2001 > From: Thovthe > Date: Sat, 2 May 2020 22:48:30 +0000 > Subject: [PATCH] 2020-05-02 Thovthe thovthe@protonmail.com > > * added new package definition for QDirStat at gnu/packages/qdirstat.scm Guix uses a very structured changelog format for commit messages. I find that the best way to figure it out is to look at the existing git log. In this case the commit message should be something like: ``` gnu: Add qdirstat. * gnu/packages/qdirstat.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. ``` > --- > gnu/packages/qdirstat.scm | 46 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > create mode 100644 gnu/packages/qdirstat.scm > > diff --git a/gnu/packages/qdirstat.scm b/gnu/packages/qdirstat.scm > new file mode 100644 > index 0000000000..91581a206e > --- /dev/null > +++ b/gnu/packages/qdirstat.scm As you may have guessed from my proposed commit message, when adding a new file, you should also add it to the appropriate section in gnu/local.mk > @@ -0,0 +1,46 @@ > +(define-module (qdirstat) The module name should be (gnu packages qdirstat) to match the file path of the module. If you'll permit me to speculate a little bit: I suspect that you developed this package outside of the main Guix repository. You can test the patches locally on your end by applying them to a git checkout of the guix repository and running guix from that checkout. See the manual pages on Building from Git and Running Guix Before it is Installed. https://guix.gnu.org/manual/en/html_node/Building-from-Git.html https://guix.gnu.org/manual/en/html_node/Running-Guix-Before-It-Is-Installed.html > + #:use-module (gnu packages qt) > + #:use-module (gnu packages compression) > + #:use-module (guix build-system gnu) > + #:use-module (guix git-download) > + #:use-module ((guix licenses) #:prefix license:) > + #:use-module (guix packages)) Since this is a new file, let's go ahead and sort these alphabetically. > +(define-public qdirstat > + (package > + (name "qdirstat") > + (version "1.6.1") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/shundhammer/qdirstat.git") > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb")))) > + (build-system gnu-build-system) > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + (replace 'configure > + (lambda* (#:key outputs #:allow-other-keys) > + (invoke "qmake" > + (string-append "PREFIX=" > + (assoc-ref outputs "out")) > + (string-append "INSTALL_PREFIX=" > + (assoc-ref outputs "out")))))))) It is our custom to have all phases return #t > + > + (inputs > + `(("qtbase" ,qtbase))) I think that perl should be added as input, so that the #! line of qdirstat-cache-writer can be patched to refer to a perl in the store. > + (native-inputs > + `(("zlib" ,zlib) I think zlib should be an input rather than a native-input since the code seems to link to it. Remember that the reason for native-inputs verses inputs is that native-inputs are needed on the host side when cross compiling. > + ("qttools" ,qttools))) > + (home-page "https://github.com/shundhammer/qdirstat") > + (synopsis "Graphical disk space inspection utility") > + (description > + "QDirStat is a graphical application to show where your disk space has > +gone and to help you to clean it up. Shaded boxes represent files and files > +are grouped by directory structure." ) Some formatting nitpicks: you can go ahead and start the description on the same line as "(description". Also there is an extra space between the closing quote and closing parentheses. The best terms I found when searching for similar packages that we already have in Guix where, "disk usage", so I think it would be good idea to work usage into the synopsis or description somehow. Perhaps change the synopsis to say, "disk usage inspection" or the description to say, "show your disk usage and help you clean it up." > + (license license:gpl2+))) qdirstat-cache-writer has a different license in its header. It's an … interesting licence :) I think it's free software, so eligable for inclusion in Guix, but probably worth recording here, so that the licence field becomes: (license (list license:gpl2+ license:non-copyleft)) ; scripts/qdirstat-cache-writer For bonus points, it might be nice to move qdirstat-cache-writer to its own output since it is made to be run independently of QDirStat and that way it could be installed without pulling in all the C++ and Graphical dependencies. Can you send an updated patch? Thanks again, Jack --925712948-1314567356-1588651294=:5735-- From debbugs-submit-bounces@debbugs.gnu.org Wed May 13 20:36:25 2020 Received: (at 41040) by debbugs.gnu.org; 14 May 2020 00:36:25 +0000 Received: from localhost ([127.0.0.1]:59893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZ1rM-0006si-Sj for submit@debbugs.gnu.org; Wed, 13 May 2020 20:36:25 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:58784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZ1rK-0006sL-EC for 41040@debbugs.gnu.org; Wed, 13 May 2020 20:36:22 -0400 Received: from marsh.hcoop.net ([45.55.52.66]) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1jZ1rE-0008Sc-Cp; Wed, 13 May 2020 20:36:16 -0400 Date: Wed, 13 May 2020 20:36:16 -0400 (EDT) From: Jack Hill X-X-Sender: jackhill@marsh.hcoop.net To: Thovthe Subject: Re: [bug#41040] [PATCH] Package Definition for QDirStat In-Reply-To: Message-ID: References: <27uwM7nMqpAz-RfKtxXzIOJWs0UnmDO3vqxoqkN1VeXR7GHQJTCgM5B0f8bCMuG2y5QsbCDj_AScqxM-4c1NO5YTf-ZAg3psDt-_FC27LJI=@protonmail.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="925712948-1586194005-1589416576=:5735" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Tue, 5 May 2020, Jack Hill wrote: > Thovthe, > > On Sun, 3 May 2020, Thovthe via Guix-patches via wrote: > >> Here is a package definition for QDirStat, an excellent tool for >> checking what files are taking up space on your system. [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE To: name matches everything in local email - LCASE headers X-Debbugs-Envelope-To: 41040 Cc: 41040@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 (-) This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --925712948-1586194005-1589416576=:5735 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8BIT On Tue, 5 May 2020, Jack Hill wrote: > Thovthe, > > On Sun, 3 May 2020, Thovthe via Guix-patches via wrote: > >> Here is a package definition for QDirStat, an excellent tool for >> checking what files are taking up space on your system.  This is >> my first guix module and it was made with help from Ryan Prior >> (github.com/sponsors/ryanprior). I have confirmed that it builds >> and runs on aarch64 but the only system I have available is this >> fairly anemic arm laptop so I haven't tested the other >> architectures. Suggestions, testing, questions, comments and >> education welcomed. > > Thanks for contributing this patch to Guix! I have some suggestions for how > it can be cleaned up so that it can be included in the distribution. Thovthe, I'd like to follow up to see if you've had a chance to consider my comments. No pressure to work on it right now, but if you need help or have additional questions, just let us know. It will be great to get this package in Guix. Best, Jack --925712948-1586194005-1589416576=:5735-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 04 03:41:01 2020 Received: (at 41040) by debbugs.gnu.org; 4 Jun 2020 07:41:01 +0000 Received: from localhost ([127.0.0.1]:45051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgkUj-0000rT-Bt for submit@debbugs.gnu.org; Thu, 04 Jun 2020 03:41:01 -0400 Received: from mail-40130.protonmail.ch ([185.70.40.130]:22357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgkUd-0000rA-09 for 41040@debbugs.gnu.org; Thu, 04 Jun 2020 03:40:55 -0400 Date: Thu, 04 Jun 2020 07:40:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1591256443; bh=DJx/vMCOt9CI0E8EIHL0D41lYzyKzaFHFQyoOlzHd34=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=d04XsOvuaYzGSuk3D4bAamrTKLFK2AcM8okGPpVgAb1oy3nUOgZJ9xy+0z3kUonNE 7ld4L/dEJoA7vf7bI78lI6QEWfAjxpei9HCf0vfMA2+dF4B0yvMwjYPUpVT/FrT4vw EoYtf9K3kniEX/2tOWTAESh7cmrQ+M4plmkZursM= To: "41040@debbugs.gnu.org" <41040@debbugs.gnu.org> From: Thovthe Subject: Re: [bug#41040] [PATCH] Package Definition for QDirStat Message-ID: In-Reply-To: References: <27uwM7nMqpAz-RfKtxXzIOJWs0UnmDO3vqxoqkN1VeXR7GHQJTCgM5B0f8bCMuG2y5QsbCDj_AScqxM-4c1NO5YTf-ZAg3psDt-_FC27LJI=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41040 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: , Reply-To: Thovthe Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > Thanks for contributing this patch to Guix! I have some suggestions for > how it can be cleaned up so that it can be included in the distribution. Sounds good, I'll try to address those suggestions. > Guix uses a very structured changelog format for commit messages. I find > that the best way to figure it out is to look at the existing git log. In > this case the commit message should be something like: > > gnu: Add qdirstat. > > * gnu/packages/qdirstat.scm: New file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. I hope the new one works fine. Do you want me to amend or smudge? > As you may have guessed from my proposed commit message, when adding a ne= w > file, you should also add it to the appropriate section in gnu/local.mk I have done, but I must admit it is somewhat confusing to me that it goes under GNU_SYSTEM_MODULES. > > @@ -0,0 +1,46 @@ > > +(define-module (qdirstat) > > The module name should be (gnu packages qdirstat) to match the file path > of the module. > > If you'll permit me to speculate a little bit: I suspect that you > developed this package outside of the main Guix repository. Done. It was originally called that but the linter told me I ought to change it. Did it do that because I worked on this outside of git? > > - #:use-module (gnu packages qt) > > - #:use-module (gnu packages compression) > > - #:use-module (guix build-system gnu) > > - #:use-module (guix git-download) > > - #:use-module ((guix licenses) #:prefix license:) > > - #:use-module (guix packages)) > > Since this is a new file, let's go ahead and sort these alphabetically. I have now but I'm not sure how to treat parens so the `licenses` line is a= t the bottom. If there is a convention feel free to change that around. > > +(define-public qdirstat > > > > - (package > > - (name "qdirstat") > > - (version "1.6.1") > > - (source > > - (origin > > - (method git-fetch) > > - (uri (git-reference > > - (url "https://github.com/shundhammer/qdirstat.git") > > - (commit version))) > > - (file-name (git-file-name name version)) > > - (sha256 > > - (base32 "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczp= b")))) > > - (build-system gnu-build-system) > > - (arguments > > - `(#:phases > > - (modify-phases %standard-phases > > - (replace 'configure > > - (lambda* (#:key outputs #:allow-other-keys) > > - (invoke "qmake" > > - (string-append "PREFIX=3D" > > - (assoc-ref outputs "out")) > > - (string-append "INSTALL_PREFIX=3D" > > - (assoc-ref outputs "out")))))))) > > It is our custom to have all phases return #t I don't really know what this means, looked through the documentation but a= ll I can workout is that something needs to pass what I assume is 'true' to= somewhere else. I took this verbatim from another definition in guix. > > - (native-inputs > > - `(("zlib" ,zlib) > > I think zlib should be an input rather than a native-input since the code > seems to link to it. Remember that the reason for native-inputs verses > inputs is that native-inputs are needed on the host side when cross > compiling. Done. > > - (home-page "https://github.com/shundhammer/qdirstat") > > - (synopsis "Graphical disk space inspection utility") > > - (description > > - "QDirStat is a graphical application to show where your disk sp= ace has > > +gone and to help you to clean it up. Shaded boxes represent files and = files > > +are grouped by directory structure." ) > > Some formatting nitpicks: you can go ahead and start the description on > the same line as "(description". Done, though I think it looks better to have it all columnised if it needs = to be broken up at 78chars. Also makes M-q in emacs behave itself. > Also there is an extra space between the closing quote and closing parent= heses. Blaming this on my tools as well possibly even the linter but I cant exactl= y recall what did it. > The best terms I found when searching for similar packages that we alread= y > have in Guix where, "disk usage", so I think it would be good idea to wor= k > usage into the synopsis or description somehow. Perhaps change the > synopsis to say, "disk usage inspection" or the description to say, "show > your disk usage and help you clean it up." Done and added analys- root word in case that comes to someone's mind rathe= r than inspection. > > - (license license:gpl2+))) > > qdirstat-cache-writer has a different license in its header. It's an = =E2=80=A6 > interesting licence :) I think it's free software, so eligable for > inclusion in Guix, but probably worth recording here, so that the licence > field becomes: > > (license (list license:gpl2+ > license:non-copyleft)) ; scripts/qdirstat-cache-writer Done. > For bonus points, it might be nice to move qdirstat-cache-writer to its > own output since it is made to be run independently of QDirStat and that > way it could be installed without pulling in all the C++ and Graphical > dependencies. How do you think this should look? Would I make another output in this qdirstat.scm? > > - > > - (inputs > > - `(("qtbase" ,qtbase))) > > > > > > I think that perl should be added as input, so that the #! line of > qdirstat-cache-writer can be patched to refer to a perl in the store. I'm leaving this for once I've moved qdirstat-cache-writer into a separate package/output since this definition works for the essential functionality. > Can you send an updated patch? Here and done! ``` >From f234ad07e06a5e97fdf1cad36e99e180ae6001f3 Mon Sep 17 00:00:00 2001 From: Thovthe Date: Thu, 4 Jun 2020 06:42:54 +0000 Subject: [PATCH] =09gnu: Add qdirstat. =09* gnu/packages/qdirstat.scm: Modified according to feedback =09* gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/qdirstat.scm | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 3c9a10b6bc..d1adcbeaa2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -440,6 +440,7 @@ GNU_SYSTEM_MODULES =3D=09=09=09=09\ %D%/packages/toys.scm=09=09=09=09\ %D%/packages/tryton.scm=09=09=09\ %D%/packages/qt.scm=09=09=09=09\ + %D%/packages/qdirstat.scm=09=09=09\ %D%/packages/radio.scm=09=09=09\ %D%/packages/ragel.scm=09=09=09\ %D%/packages/rails.scm=09=09=09\ diff --git a/gnu/packages/qdirstat.scm b/gnu/packages/qdirstat.scm index 91581a206e..a450b8a51a 100644 --- a/gnu/packages/qdirstat.scm +++ b/gnu/packages/qdirstat.scm @@ -1,10 +1,10 @@ -(define-module (qdirstat) - #:use-module (gnu packages qt) +(define-module (gnu packages qdirstat) #:use-module (gnu packages compression) + #:use-module (gnu packages qt) #:use-module (guix build-system gnu) #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module ((guix licenses) #:prefix license:)) (define-public qdirstat @@ -33,14 +33,14 @@ (assoc-ref outputs "out")))))))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase) + ("zlib" ,zlib))) (native-inputs - `(("zlib" ,zlib) - ("qttools" ,qttools))) + `(("qttools" ,qttools))) (home-page "https://github.com/shundhammer/qdirstat") (synopsis "Graphical disk space inspection utility") - (description - "QDirStat is a graphical application to show where your disk space ha= s -gone and to help you to clean it up. Shaded boxes represent files and fil= es -are grouped by directory structure." ) - (license license:gpl2+))) + (description "QDirStat is a graphical application for analysing disk u= sage. It shows +where your disk space has gone and helps you clean it up. Shaded boxes +represent files and files are grouped by directory structure.") + (license (list license:gpl2+ + license:non-copyleft)))) ; scripts/qdirstat-cache-write= r -- 2.26.2 ``` From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 07 00:23:49 2020 Received: (at 41040) by debbugs.gnu.org; 7 Jun 2020 04:23:49 +0000 Received: from localhost ([127.0.0.1]:53136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhmqY-0002uZ-Qi for submit@debbugs.gnu.org; Sun, 07 Jun 2020 00:23:49 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:33468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhmqT-0002uJ-MN for 41040@debbugs.gnu.org; Sun, 07 Jun 2020 00:23:45 -0400 Received: from marsh.hcoop.net ([45.55.52.66]) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1jhmqN-0002mu-MD; Sun, 07 Jun 2020 00:23:35 -0400 Date: Sun, 7 Jun 2020 00:23:35 -0400 (EDT) From: Jack Hill X-X-Sender: jackhill@marsh.hcoop.net To: Thovthe Subject: Re: [bug#41040] [PATCH] Package Definition for QDirStat In-Reply-To: Message-ID: References: <27uwM7nMqpAz-RfKtxXzIOJWs0UnmDO3vqxoqkN1VeXR7GHQJTCgM5B0f8bCMuG2y5QsbCDj_AScqxM-4c1NO5YTf-ZAg3psDt-_FC27LJI=@protonmail.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="925712948-1163781102-1591503815=:5735" X-Spam-Score: 1.6 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Thu, 4 Jun 2020, Thovthe via Guix-patches via wrote: >> Thanks for contributing this patch to Guix! I have some suggestions for >> how it can be cleaned up so that it can be included in the distribution. > > Sounds good, I'll try to address those sugges [...] Content analysis details: (1.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: local.mk] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.6 PDS_TONAME_EQ_TOLOCAL_HDRS_LCASE To: name matches everything in local email - LCASE headers X-Debbugs-Envelope-To: 41040 Cc: "41040@debbugs.gnu.org" <41040@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 (-) This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --925712948-1163781102-1591503815=:5735 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8BIT On Thu, 4 Jun 2020, Thovthe via Guix-patches via wrote: >> Thanks for contributing this patch to Guix! I have some suggestions for >> how it can be cleaned up so that it can be included in the distribution. > > Sounds good, I'll try to address those suggestions. Thanks! The patch looks improved to me. However, I'm still new to reviewing patches, so I don't know the answers to some of your questions. I also realized that I gave you bad advice is some places. Apologies, and thanks for bearing with me. A more experienced person will be the one to commit the patch, and I'm sure that they will correct anything else I got wrong. >> Guix uses a very structured changelog format for commit messages. I find >> that the best way to figure it out is to look at the existing git log. In >> this case the commit message should be something like: >> >> gnu: Add qdirstat. >> >> * gnu/packages/qdirstat.scm: New file. >> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. > > I hope the new one works fine. Do you want me to amend or smudge? I'm not sure what you mean by smudge, but I think the answer is to amend. The idea is to have one commit that goes from having no QDirStat at all to working QDirStat package reflecting the improvements made during this review. >> As you may have guessed from my proposed commit message, when adding a new >> file, you should also add it to the appropriate section in gnu/local.mk > > I have done, but I must admit it is somewhat confusing to me that it goes > under GNU_SYSTEM_MODULES. I don't know why it is called GNU_SYSTEM_MODULES. >>> @@ -0,0 +1,46 @@ >>> +(define-module (qdirstat) >> >> The module name should be (gnu packages qdirstat) to match the file path >> of the module. >> >> If you'll permit me to speculate a little bit: I suspect that you >> developed this package outside of the main Guix repository. > > Done. > > It was originally called that but the linter told me I ought to change > it. Did it do that because I worked on this outside of git? Yes, I think that's exactly it. Since the module name mirrors the relative file system path it is sensitive to those types of changes. >>> - #:use-module (gnu packages qt) >>> - #:use-module (gnu packages compression) >>> - #:use-module (guix build-system gnu) >>> - #:use-module (guix git-download) >>> - #:use-module ((guix licenses) #:prefix license:) >>> - #:use-module (guix packages)) >> >> Since this is a new file, let's go ahead and sort these alphabetically. > > I have now but I'm not sure how to treat parens so the `licenses` line is at the > bottom. If there is a convention feel free to change that around. Thanks. How we prefer to handle the guix licenses case is another thing that I don't know. […] >>> - (arguments >>> - `(#:phases >>> - (modify-phases %standard-phases >>> - (replace 'configure >>> - (lambda* (#:key outputs #:allow-other-keys) >>> - (invoke "qmake" >>> - (string-append "PREFIX=" >>> - (assoc-ref outputs "out")) >>> - (string-append "INSTALL_PREFIX=" >>> - (assoc-ref outputs "out")))))))) >> >> It is our custom to have all phases return #t > > I don't really know what this means, looked through the documentation > but all I can workout is that something needs to pass what I assume is > 'true' to somewhere else. I took this verbatim from another definition > in guix. What I meant was that the lambda should return the value #t. Sometime we ensure this by adding a literal #t as the last form in the body of the lambda like: (lambda (arg) (do-interesting-stuff …) ; this returns some value other than #t #t) However, it turns out that invoke always returns #t on its own, so what you had originally was fine. Sorry for the confusion. >>> - (native-inputs >>> - `(("zlib" ,zlib) >> >> I think zlib should be an input rather than a native-input since the code >> seems to link to it. Remember that the reason for native-inputs verses >> inputs is that native-inputs are needed on the host side when cross >> compiling. > > Done. Great! >>> - (home-page "https://github.com/shundhammer/qdirstat") >>> - (synopsis "Graphical disk space inspection utility") >>> - (description >>> - "QDirStat is a graphical application to show where your disk space has >>> +gone and to help you to clean it up. Shaded boxes represent files and files >>> +are grouped by directory structure." ) >> >> Some formatting nitpicks: you can go ahead and start the description on >> the same line as "(description". > > Done, though I think it looks better to have it all columnised if it needs to be > broken up at 78chars. Also makes M-q in emacs behave itself. This is another thing that I got wrong. It looks like having the newline is a common thing to do in Guix, probably for the reasons you describe. Feel free to put this back as it was. Sorry for creating extra work. >> Also there is an extra space between the closing quote and closing parentheses. > > Blaming this on my tools as well possibly even the linter but I cant exactly recall what did it. :) >> The best terms I found when searching for similar packages that we already >> have in Guix where, "disk usage", so I think it would be good idea to work >> usage into the synopsis or description somehow. Perhaps change the >> synopsis to say, "disk usage inspection" or the description to say, "show >> your disk usage and help you clean it up." > > Done and added analys- root word in case that comes to someone's mind rather > than inspection. Great, thank you. >>> - (license license:gpl2+))) >> >> qdirstat-cache-writer has a different license in its header. It's an … >> interesting licence :) I think it's free software, so eligable for >> inclusion in Guix, but probably worth recording here, so that the licence >> field becomes: >> >> (license (list license:gpl2+ >> license:non-copyleft)) ; scripts/qdirstat-cache-writer > > Done. Thanks. >> For bonus points, it might be nice to move qdirstat-cache-writer to its >> own output since it is made to be run independently of QDirStat and that >> way it could be installed without pulling in all the C++ and Graphical >> dependencies. > > How do you think this should look? Would I make another output in this > qdirstat.scm? Yes, adding another output is what I was thinking. The bind package is an example of this. >>> - >>> - (inputs >>> - `(("qtbase" ,qtbase))) >>> >>> >> >> I think that perl should be added as input, so that the #! line of >> qdirstat-cache-writer can be patched to refer to a perl in the store. > > I'm leaving this for once I've moved qdirstat-cache-writer into a > separate package/output since this definition works for the essential > functionality. Ok. To summarize: Can you squash your squash all your changes together to send one patch? A more experienced Guix reviewer will have to answer the questions about the ordering of the module imports and the right thing to do with qdirstat-cache-writer. Once that's all done, they should be able to commit QDirStat to Guix! Thanks again for your patience, Jack --925712948-1163781102-1591503815=:5735-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 13 17:51:49 2020 Received: (at 41040) by debbugs.gnu.org; 13 Jun 2020 21:51:50 +0000 Received: from localhost ([127.0.0.1]:42603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkE43-0004wo-Iq for submit@debbugs.gnu.org; Sat, 13 Jun 2020 17:51:49 -0400 Received: from mail-40132.protonmail.ch ([185.70.40.132]:53090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkE3x-0004wU-0H for 41040@debbugs.gnu.org; Sat, 13 Jun 2020 17:51:46 -0400 Date: Sat, 13 Jun 2020 21:51:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1592085093; bh=AWKIWyl2mVpAE2HDLmgC9S57dl7Pu/1tfyWHC94MTPU=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=pg8MvXk/ukNe9K/i9gABn9lSJPnNa/uiwJxldY8JTq4Mgtk6MWGRtIOB3ZZ+LKDnm BIBtPEnOvh1+iF4Ho342c5oxzSryKB05tueQpuU5I8GV14s/ys/1bELrva930H62nb aQ159qOfFicygOSltA7fBS2uDf6VIwnyDF3PFarI= To: "41040@debbugs.gnu.org" <41040@debbugs.gnu.org> From: Thovthe Subject: Re: [bug#41040] [PATCH] Package Definition for QDirStat Message-ID: In-Reply-To: References: <27uwM7nMqpAz-RfKtxXzIOJWs0UnmDO3vqxoqkN1VeXR7GHQJTCgM5B0f8bCMuG2y5QsbCDj_AScqxM-4c1NO5YTf-ZAg3psDt-_FC27LJI=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41040 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: , Reply-To: Thovthe Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > This is another thing that I got wrong. It looks like having the newline > is a common thing to do in Guix, probably for the reasons you describe. > Feel free to put this back as it was. Sorry for creating extra work. Not a problem. I'm happy that it's ok for it to closer match my sense of aesthetics. I've also moved some things around and added a line of white space for read= ability and separation of concerns. > > > I think that perl should be added as input, so that the #! line of > > > qdirstat-cache-writer can be patched to refer to a perl in the store. > > > > I'm leaving this for once I've moved qdirstat-cache-writer into a > > separate package/output since this definition works for the essential > > functionality. > > Ok. > ------------------------- > > > For bonus points, it might be nice to move qdirstat-cache-writer to i= ts > > > own output since it is made to be run independently of QDirStat and t= hat > > > way it could be installed without pulling in all the C++ and Graphica= l > > > dependencies. > > > > How do you think this should look? Would I make another output in this > > qdirstat.scm? > > Yes, adding another output is what I was thinking. The bind package is an > example of this. I've added some comments about this but right now I'm not interested in fig= uring out how this package is built at a lower level since with this definition provides the essential functionality and all tests pass. > To summarize: > > Can you squash your squash all your changes together to send one patch? > > A more experienced Guix reviewer will have to answer the questions about > the ordering of the module imports and the right thing to do with > qdirstat-cache-writer. > > Once that's all done, they should be able to commit QDirStat to Guix! Alright, it should look like it's popped into being from the very aether. >From 159a4f8b44537c8b76db52b65cd9571962cb58e4 Mon Sep 17 00:00:00 2001 From: Thovthe Date: Sat, 13 Jun 2020 21:42:38 +0000 Subject: [PATCH] gnu: Add qdirstat. * gnu/packages/qdirstat.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/qdirstat.scm | 49 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 gnu/packages/qdirstat.scm diff --git a/gnu/local.mk b/gnu/local.mk index aa5b67ab5f..2d06d1030c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -447,6 +447,7 @@ GNU_SYSTEM_MODULES =3D=09=09=09=09\ %D%/packages/python-xyz.scm=09=09=09\ %D%/packages/toys.scm=09=09=09=09\ %D%/packages/tryton.scm=09=09=09\ + %D%/packages/qdirstat.scm=09=09=09\ %D%/packages/qt.scm=09=09=09=09\ %D%/packages/radio.scm=09=09=09\ %D%/packages/ragel.scm=09=09=09\ diff --git a/gnu/packages/qdirstat.scm b/gnu/packages/qdirstat.scm new file mode 100644 index 0000000000..8188357855 --- /dev/null +++ b/gnu/packages/qdirstat.scm @@ -0,0 +1,49 @@ +(define-module (gnu packages qdirstat) + #:use-module (gnu packages compression) + #:use-module (gnu packages qt) + #:use-module (guix build-system gnu) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module ((guix licenses) #:prefix license:)) + + +(define-public qdirstat + (package + (name "qdirstat") + (version "1.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shundhammer/qdirstat.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb")))) + + (outputs `("out"))=09=09=09; "cache-writer" could be made an output + (inputs + `(("qtbase" ,qtbase)=09=09; Could add ("perl" ,perl) as an input + ("zlib" ,zlib)))=09=09=09; for the cache-writer see debbug#41040 + (native-inputs + `(("qttools" ,qttools))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" + (string-append "PREFIX=3D" + (assoc-ref outputs "out")) + (string-append "INSTALL_PREFIX=3D" + (assoc-ref outputs "out")))))))) + + (home-page "https://github.com/shundhammer/qdirstat") + (synopsis "Graphical disk space inspection utility") + (description + "QDirStat is a graphical application for analysing disk usage. It sh= ows +where your disk space has gone and helps you clean it up. Shaded boxes +represent files and files are grouped by directory structure.") + (license (list license:gpl2+ + license:non-copyleft)))) ; scripts/qdirstat-cache-write= r -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 28 08:56:36 2020 Received: (at 41040) by debbugs.gnu.org; 28 Jun 2020 12:56:36 +0000 Received: from localhost ([127.0.0.1]:45612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpWrK-0008Qu-OZ for submit@debbugs.gnu.org; Sun, 28 Jun 2020 08:56:36 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:59862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpWrF-0008Qg-2Q for 41040@debbugs.gnu.org; Sun, 28 Jun 2020 08:56:33 -0400 Received: (qmail 23392 invoked by uid 1009); 28 Jun 2020 14:56:26 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25856. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.069066 secs); 28 Jun 2020 12:56:26 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 28 Jun 2020 14:56:26 +0200 Date: Sun, 28 Jun 2020 14:56:24 +0200 From: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= To: Thovthe Subject: Re: [bug#41040] [PATCH] Package Definition for QDirStat Message-ID: <20200628125624.3vr2borezix5ij4s@gravity> References: <27uwM7nMqpAz-RfKtxXzIOJWs0UnmDO3vqxoqkN1VeXR7GHQJTCgM5B0f8bCMuG2y5QsbCDj_AScqxM-4c1NO5YTf-ZAg3psDt-_FC27LJI=@protonmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tssho3rsprjbdjo2" Content-Disposition: inline In-Reply-To: X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41040 Cc: "41040@debbugs.gnu.org" <41040@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 (-) --tssho3rsprjbdjo2 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks for your patch! The repository includes man pages, but the built package doesn't. Interestingly, the man1 directory is there, it's just empty. Could you investigate why this happens? On Sat, Jun 13, 2020 at 09:51:29PM +0000, Thovthe wrote: > > > > I think that perl should be added as input, so that the #! line of > > > > qdirstat-cache-writer can be patched to refer to a perl in the stor= e. > > > > > > I'm leaving this for once I've moved qdirstat-cache-writer into a > > > separate package/output since this definition works for the essential > > > functionality. > > > > Ok. > > ------------------------- > > > > For bonus points, it might be nice to move qdirstat-cache-writer to= its > > > > own output since it is made to be run independently of QDirStat and= that > > > > way it could be installed without pulling in all the C++ and Graphi= cal > > > > dependencies. > > > > > > How do you think this should look? Would I make another output in this > > > qdirstat.scm? > > > > Yes, adding another output is what I was thinking. The bind package is = an > > example of this. >=20 > I've added some comments about this but right now I'm not interested in f= iguring > out how this package is built at a lower level since with this definition > provides the essential functionality and all tests pass. I don't think it makes much sense to separate it into another output, given that the data produced by the script would be consumed by qdirstat proper anyway. It does make sense, however, to include perl as an input. This makes the script work even though /usr/bin/perl doesn't exist on Guix System. > >From 159a4f8b44537c8b76db52b65cd9571962cb58e4 Mon Sep 17 00:00:00 2001 > From: Thovthe > Date: Sat, 13 Jun 2020 21:42:38 +0000 > Subject: [PATCH] gnu: Add qdirstat. >=20 > * gnu/packages/qdirstat.scm: New file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. > --- > gnu/local.mk | 1 + > gnu/packages/qdirstat.scm | 49 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 50 insertions(+) > create mode 100644 gnu/packages/qdirstat.scm Applying this patch was a bit problematic. If you put your comments after the --- here and send the mail with git send-email (from the send-email output of the git package), it would get picked up automatically. Sending the patch as an attachment also works. However, pasting the patch into the message requires quite some fiddling with 'git am'... > diff --git a/gnu/packages/qdirstat.scm b/gnu/packages/qdirstat.scm > new file mode 100644 > index 0000000000..8188357855 > --- /dev/null > +++ b/gnu/packages/qdirstat.scm > @@ -0,0 +1,49 @@ > +(define-module (gnu packages qdirstat) > + #:use-module (gnu packages compression) > + #:use-module (gnu packages qt) > + #:use-module (guix build-system gnu) > + #:use-module (guix git-download) > + #:use-module (guix packages) > + #:use-module ((guix licenses) #:prefix license:)) Make sure to include the copyright header that's present in all other files. > +(define-public qdirstat > + (package > + (name "qdirstat") > + (version "1.6.1") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/shundhammer/qdirstat.git") > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb"))= )) > + > + (outputs `("out")) ; "cache-writer" could be made an output There's no point in specifying OUTPUTS if we're going to use the default value. Regards, Jakub K=C4=85dzio=C5=82ka --tssho3rsprjbdjo2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl74k3gACgkQ4xWnWEYT FWTLUA/+PkJz7GjI6VxjT9OLRy7bwGXIGq0CRJ4e1HSe1Idkfc2xAn+fzhbsRE9A Tx5UeuHGQcWf0kuWJGS1wQ/aCp2+6I9QHsCGivjxEoqq5V7jrnnjGHCz3gJQ/e2r 6wUQ0uO7RMau+uaSYK/0LlNt1eATyO02EbGFv7eBbQ4KkhP3mVocQ52TEv6+1aq9 uQn1UBJGqZ9DJqhCdou6kaGVzxaeUQv1Fy30mYAUPRLkFpdHZM6ZdWfv58gLCKTi ciXINDGLxtikhW4Ab3863AXpgJ6AYu3JijM5yFLjd3D2FzJFMUcsLSfnPxRf6WbO QSYNlTj+fOT+Kph5L9F7Zh2nwuuBsvsZIi+1bKrNDl5teWsRngckOeBZp1+r5rvS eneSIMZd4I+6xXuRIGkh1iv76CApnOVqKSprkab7VuGsdTNv2iS2iHecMdp5AD7b a3AcxgG1ayYToqa1hb10FiD3dQ7bNyxzCAXrNgLVt+UZukDaapUuTP8MikSdIBnK EAiMDVVdA5rpJGGTQnT+qIAW/Bx8g76cZ7Rk2MhIejCkNuci1VyfD5V0xfuENVok okpK1IrHSD3AG5ORnfXFXcVkLUiggdlI3v7frd2/pdoz0tmZnJi4sEZSIinmxTLz 25vkXO0PQBWeRV7zaRclbURp3K9GtgBHsZiTptoLueOg7JE60dU= =k9dq -----END PGP SIGNATURE----- --tssho3rsprjbdjo2--