From patchwork Sat Jun 13 21:51:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 22702 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 27AB227BBE3; Sat, 13 Jun 2020 23:00:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7F6BB27BBE1 for ; Sat, 13 Jun 2020 23:00:34 +0100 (BST) Received: from localhost ([::1]:55860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkECX-00050v-Sv for patchwork@mira.cbaines.net; Sat, 13 Jun 2020 18:00:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkE4I-0000K0-UB for guix-patches@gnu.org; Sat, 13 Jun 2020 17:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59290) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkE4I-0004Pz-Hu for guix-patches@gnu.org; Sat, 13 Jun 2020 17:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jkE4I-0004xH-FA for guix-patches@gnu.org; Sat, 13 Jun 2020 17:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41040] [PATCH] Package Definition for QDirStat Resent-From: Thovthe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Jun 2020 21:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41040 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "41040@debbugs.gnu.org" <41040@debbugs.gnu.org> Received: via spool by 41040-submit@debbugs.gnu.org id=B41040.159208511019028 (code B ref 41040); Sat, 13 Jun 2020 21:52:02 +0000 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= Message-ID: In-Reply-To: References: <27uwM7nMqpAz-RfKtxXzIOJWs0UnmDO3vqxoqkN1VeXR7GHQJTCgM5B0f8bCMuG2y5QsbCDj_AScqxM-4c1NO5YTf-ZAg3psDt-_FC27LJI=@protonmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Thovthe , Thovthe via Guix-patches X-Patchwork-Original-From: Thovthe via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches > 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 readability 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 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. I've added some comments about this but right now I'm not interested in figuring 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 -- 2.26.2 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 = \ %D%/packages/python-xyz.scm \ %D%/packages/toys.scm \ %D%/packages/tryton.scm \ + %D%/packages/qdirstat.scm \ %D%/packages/qt.scm \ %D%/packages/radio.scm \ %D%/packages/ragel.scm \ 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")) ; "cache-writer" could be made an output + (inputs + `(("qtbase" ,qtbase) ; Could add ("perl" ,perl) as an input + ("zlib" ,zlib))) ; 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=" + (assoc-ref outputs "out")) + (string-append "INSTALL_PREFIX=" + (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 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-writer