From patchwork Sat Dec 21 23:13:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 19421 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 BAC8D1796F; Sat, 21 Dec 2019 23:14:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7683F17968 for ; Sat, 21 Dec 2019 23:14:20 +0000 (GMT) Received: from localhost ([::1]:42834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iinwx-00050e-RB for patchwork@mira.cbaines.net; Sat, 21 Dec 2019 18:14:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50725) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iinwh-00050Y-LX for guix-patches@gnu.org; Sat, 21 Dec 2019 18:14:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iinwg-0006NB-Hl for guix-patches@gnu.org; Sat, 21 Dec 2019 18:14:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iinwg-0006MH-CN for guix-patches@gnu.org; Sat, 21 Dec 2019 18:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iinwg-0004pP-6e for guix-patches@gnu.org; Sat, 21 Dec 2019 18:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38553] [PATCH 01/12] gnu: Add grantleetheme. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Dec 2019 23:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hartmut Goebel Cc: 38553@debbugs.gnu.org Received: via spool by 38553-submit@debbugs.gnu.org id=B38553.157697002918533 (code B ref 38553); Sat, 21 Dec 2019 23:14:02 +0000 Received: (at 38553) by debbugs.gnu.org; 21 Dec 2019 23:13:49 +0000 Received: from localhost ([127.0.0.1]:48902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iinwT-0004or-63 for submit@debbugs.gnu.org; Sat, 21 Dec 2019 18:13:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iinwR-0004od-OF for 38553@debbugs.gnu.org; Sat, 21 Dec 2019 18:13:48 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iinwM-00058o-BN; Sat, 21 Dec 2019 18:13:42 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=33240 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iinwL-0001Cz-RR; Sat, 21 Dec 2019 18:13:42 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20191209215219.24247-1-h.goebel@crazy-compilers.com> <20191209215358.24449-1-h.goebel@crazy-compilers.com> <87immckle4.fsf@gnu.org> <176afb50-286a-6b0b-b6cb-25090adc4630@crazy-compilers.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 2 =?utf-8?q?Niv=C3=B4se?= an 228 de la =?utf-8?q?R?= =?utf-8?q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 22 Dec 2019 00:13:40 +0100 In-Reply-To: <176afb50-286a-6b0b-b6cb-25090adc4630@crazy-compilers.com> (Hartmut Goebel's message of "Sat, 21 Dec 2019 20:19:36 +0100") Message-ID: <874kxtmfvf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Hi, Hartmut Goebel skribis: >>> + (modify-phases (@ (guix build qt-build-system) %standard-phases) >> ^ >> As a rule of thumb, we should avoid using ‘@’ and ‘@@’. So here, I’d >> suggest writing >> >> #:modules ((guix build qt-build-system) …) >> >> to make sure that module is in scope. > > AFAIU the module already is in scope, since it is part of > %qt-build-system-modules. What I intend here is to address > "%standard-phases" as defined in (guix build qt-build-system). Actually, unless I’m mistaken, (guix build qt-build-system) is not in scope by default. To fix it, we need: Does that make sense? With this change in place, no need for ‘@’! :-) >>> + (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) >> Could you add a comment explaining whether this is triple-license or >> something else? > > This seems to be common to many KDE packages including programs, libs > and docs. Programs have GPL, libs have LGPL and docs have FDL. Of course > I can add a respective comment, which most of the packages would get. Is > this your intention? Oh I see. Yes, that was my intention, but I guess you could make a super-concise one-line summary of that. Thanks! Ludo’. diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index b776845377..e2f277d3ca 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -126,7 +126,7 @@ (qt-wrap-excluded-outputs ''()) (system (%current-system)) (imported-modules %qt-build-system-modules) - (modules '((guix build cmake-build-system) + (modules '((guix build qt-build-system) (guix build utils)))) "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." @@ -208,7 +208,7 @@ provides a 'CMakeLists.txt' file as its build system." (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %qt-build-system-modules) - (modules '((guix build cmake-build-system) + (modules '((guix build qt-build-system) (guix build utils)))) "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its