From patchwork Mon Mar 29 19:20:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 28177 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 0564527BC63; Mon, 29 Mar 2021 20:22:18 +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, SPF_HELO_PASS,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 ESMTPS id 4E9F627BC64 for ; Mon, 29 Mar 2021 20:22:11 +0100 (BST) Received: from localhost ([::1]:46280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQxSk-0006Hs-Gl for patchwork@mira.cbaines.net; Mon, 29 Mar 2021 15:22:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQxSc-0006HW-RP for guix-patches@gnu.org; Mon, 29 Mar 2021 15:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQxSc-0004oT-Ju for guix-patches@gnu.org; Mon, 29 Mar 2021 15:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQxSc-0003Yv-GB for guix-patches@gnu.org; Mon, 29 Mar 2021 15:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47484] [PATCH]: Use 'gtk-doc/stable' instead of 'gtk-doc' in native-inputs Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Mar 2021 19:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47484 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47484@debbugs.gnu.org Cc: mhw@netris.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161704567613636 (code B ref -1); Mon, 29 Mar 2021 19:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Mar 2021 19:21:16 +0000 Received: from localhost ([127.0.0.1]:49669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQxRk-0003Xk-SD for submit@debbugs.gnu.org; Mon, 29 Mar 2021 15:21:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:47572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQxRd-0003WV-13 for submit@debbugs.gnu.org; Mon, 29 Mar 2021 15:21:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQxRc-00065u-RK for guix-patches@gnu.org; Mon, 29 Mar 2021 15:21:00 -0400 Received: from andre.telenet-ops.be ([2a02:1800:120:4::f00:15]:55114) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQxRX-0004Aa-C8 for guix-patches@gnu.org; Mon, 29 Mar 2021 15:21:00 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id mKLr2400b0mfAB401KLrY2; Mon, 29 Mar 2021 21:20:52 +0200 Message-ID: <1c4c6ea95c20b74e020a762ac2618e87ceff1f81.camel@telenet.be> From: Maxime Devos Date: Mon, 29 Mar 2021 21:20:35 +0200 User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1617045652; bh=VPsQhiW4NRrdglrAtTwB1EJdho3wY45XmFb5Ii5F5q8=; h=Subject:From:To:Cc:Date; b=gRKSETYz5JmBvRgJMIlmQfQTMJLXQ0TUG/h0w+DQBEedp3UioYXnTS6CJS8qExO3K mUmmoc69yFT3QxbCotQskCiHHlUl9FWP70BwyioOP5LQrDhr5p6eo6FEqxOuVTAJ6v Yazrbo7rB/5gBrTEJ+EHs5w7N9GbczM2BAk8BVZbpRB3Jy3MZ3EbW6iZnSzMH0zNCd MJoxMgBfdX2D3+LV7two6x8A6+lYcwoL47zPNa62AkG80TbbVlAv7Sr+XZBSgYAOEK pYUs6spwTDuWl63hiUl2RkoBzkad5DYv+SrTkNjxl1oyuqbZ0pNBbMhQ/DCMbfm3rW dDO+5WprVbmpQ== Received-SPF: pass client-ip=2a02:1800:120:4::f00:15; envelope-from=maximedevos@telenet.be; helo=andre.telenet-ops.be 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches Hi Guix, See: * Patch #1: Use 'gtk-doc/stable' instead of 'gtk-doc' in native-inputs To test packages can still be built: PACKAGES="thermald glimpse glib mate-desktop atril caja-extensions" PACKAGES+=" mate-utils eom engrampa pluma mate-polkit" PACKAGES+=" libgnt loudmouth denemo gsequencer libu2f-host libu2f-server" PACKAGES+=" keybinder keybinder-3.0" ./pre-inst-env guix build $PACKAGES -M # Output: The following derivation will be built: /gnu/store/n84fwcigw3djfxv12iqv76bwp2gx9mnf-denemo-2.5.0.drv The following files will be downloaded: [...] ./pre-inst-env guix build denemo [Bla bla.] # Success! To test no references to imagemagick or gtk-doc are retained: ./pre-inst-env guix graph --type=references $PACKAGES # ^ search for imagemagick in output # ^ TODO it should not be required to substitute $PACKAGES # first, as the 'references' information is in the narinfo. * Patch #2: Export canonicalize-reference * Patch #3: Add a '#:disallowed-references' argument to 'python-build'. Used in later patches. * Patch #4: Let 'python-sphinx' use 'imagemagick/stable'. python-sphinx depends on imagemagick. As (before this patch series), many packages depend on 'python-sphinx' ... guix refresh --list-dependent python-sphinx Building the following 199 packages would ensure 427 dependent packages are rebuilt: [...] ... it may be worthwile to depend a /stable variant of python-sphinx, and use it when sphinx is used only for generating the documentation. However, defining a variant of python-sphinx is not required, as python-sphinx does not retain its reference to imagemagick. Thus, I simply replaced 'imagemagick' with 'imagemagick/stable' in the inputs. To make sure python-sphinx does not retain references to imagemagick/stable, I added #:disallowed-references `(,imagemagick/stable) to #:arguments. It is commented out in the patch to avoid rebuilds: $ ./pre-inst-env guix build python-sphinx > substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% > 1.6 MB will be downloaded: > /gnu/store/sf2kdppaf8z2ri40rlp27l7ffkd8kvyf-python-sphinx-3.3.1 > substituting /gnu/store/sf2kdppaf8z2ri40rlp27l7ffkd8kvyf-python-sphinx-3.3.1... > downloading from https://ci.guix.gnu.org/nar/lzip/sf2kdppaf8z2ri40rlp27l7ffkd8kvyf-python-sphinx-3.3.1 ... > python-sphinx-3.3.1 1.5MiB 121KiB/s 00:13 [##################] 100.0% > [...] When uncommented, 'python-sphinx' still builds. * Patch #5 .. #10: I replaced imagemagick with imagemagick/stable in some packages * After this patch series: how many packages would be rebuild if imagemagick is updated? $ ./pre-inst-env guix refresh --list-dependent imagemagick@6.9.12-4 > Building the following 47 packages would ensure 73 dependent packages are rebuilt: [..] Also, I verified ./pre-inst-env guix build guix still succeeds. Greetings, Maxime. From d7e7187f2387424d6b37e903efe4aed809733dd4 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Mon, 29 Mar 2021 20:14:35 +0200 Subject: [PATCH 10/10] gnu: inkscape-1.0: Do *not* yet use 'imagemagick/stable'. First, will have to be fixed. * gnu/packages/inkscape (inkscape-1.0)[native-inputs]: Do not yet replace 'imagemagick' with 'imagemagick/stable', as 'imagemagick' ends up in the closure. --- gnu/packages/inkscape.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 075f901b2d..3b774ceaa1 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Boris A. Dekshteyn ;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2021 Maxim Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -221,6 +222,11 @@ endif()~%~%" #:modules ((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) + ;; TODO: uncomment this when + ;; has been fixed. + ;; Prevent the 'imagemagick/stable' package from ending + ;; up in the closure. + ;; #:disallowed-references (,imagemagick/stable) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-icon-cache-generator @@ -291,6 +297,9 @@ endif()~%~%" ("python-numpy" ,python-numpy) ("python-lxml" ,python-lxml))) (native-inputs + ;; TODO: it would be nice to use 'imagemagick/stable' here, + ;; but that is not possible yet. See + ;; . `(("imagemagick" ,imagemagick) ;for tests ("intltool" ,intltool) ("glib" ,glib "bin") -- 2.31.1