From patchwork Sat Mar 11 16:51:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 47901 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 20FDB169E6; Sat, 11 Mar 2023 16:52:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 82F7B16878 for ; Sat, 11 Mar 2023 16:52:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pb2Rv-0006ml-JW; Sat, 11 Mar 2023 11:52:03 -0500 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 1pb2Ru-0006mN-AQ for guix-patches@gnu.org; Sat, 11 Mar 2023 11:52:02 -0500 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 1pb2Rt-0005tY-Qm for guix-patches@gnu.org; Sat, 11 Mar 2023 11:52:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pb2Rt-00022U-Mx for guix-patches@gnu.org; Sat, 11 Mar 2023 11:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62036] [PATCH v2] guix: packages: Consider 'patches' by 'package-direct-sources'. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Mar 2023 16:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62036 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62036@debbugs.gnu.org Cc: Josselin Poiret , Tobias Geerinckx-Rice , Simon Tournier , Mathieu Othacehe , ludo@gnu.org, Christopher Baines , Ricardo Wurmus Received: via spool by 62036-submit@debbugs.gnu.org id=B62036.16785534887797 (code B ref 62036); Sat, 11 Mar 2023 16:52:01 +0000 Received: (at 62036) by debbugs.gnu.org; 11 Mar 2023 16:51:28 +0000 Received: from localhost ([127.0.0.1]:58547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pb2RM-00021g-5L for submit@debbugs.gnu.org; Sat, 11 Mar 2023 11:51:28 -0500 Received: from mail-wm1-f42.google.com ([209.85.128.42]:38861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pb2RK-00021U-H0 for 62036@debbugs.gnu.org; Sat, 11 Mar 2023 11:51:27 -0500 Received: by mail-wm1-f42.google.com with SMTP id o5-20020a05600c510500b003ec0e4ec6deso2088394wms.3 for <62036@debbugs.gnu.org>; Sat, 11 Mar 2023 08:51:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678553480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Sl7Loj787Rego6/ljF57gluEd/2uTE+v/hAcm+9o5Vw=; b=og1guvKJBZxCHajCarh3BsYCE/Em4DjhTa3v4EibZ9b3Ep94+AwE5VYl9rOm2+WOjH 4bRd+gIom/Jki/U8STswOI28iVtPH1mPngY8btsr74I+5H3Rv/bnwic+GP75fqpxZysy GxwbZyxL7OTxm1ee1VxcHlP3b2uSfIqbvHSBSUYCeYRqaXdbDk9gv7Z4ZPDmaDUNdNRY qdLmCBdkOZgYhz5uEm/qBMdOvVhNRyZXyBj3iXFksQhkndkpUsiytbrt9V1pSs4CSztD 8J20qElFdl+vub4nsJeobanEkCGK6RyBMDQS34XOKqFftTs1BhID7m9eMKgzrIrlrzKw +HJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678553480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sl7Loj787Rego6/ljF57gluEd/2uTE+v/hAcm+9o5Vw=; b=Z+yeO1iBYOY84peBOcvusNBQr0FibzufC0AAVAuWBqcry8DMYiMz2XTVuMmLS7xSkr Xq4CDPLGqQi+2z7B5gJmSdW3rVyVk0oi1gJH61iS4ehffFy3byx/Efvdml6SK8Qgemlj DS0pNePAeM4hgvclEghJk/VCxrhFu4YxiPrhPZoV71OhsJdG42rfTeg2pRaANg40AhkZ OlMlCs42PoLye945mHeW4KmD8CYymkK9htlRpoMSmgquPcn3bgCgK7HhS3NA5fwOCEb+ anSLkcujXPtdZFS8PePQdUpH0xni9//4c0FHPDnjTnRibPxgyLevy4yLL1UKMLDjJlYy kRkA== X-Gm-Message-State: AO0yUKVuraJkorpFyhEtVeW/1u1BNy85ejejlMLsp0mmyv0jrNzeQgBL nuUtdAcHpVBk2+SmxzM21jpk7iunPOw= X-Google-Smtp-Source: AK7set/aJXRk3DXxKVQl3X8CHlrZr4KB/EMj7wvLCvU4Y34VBv43MJAufQEsyDxQPiICfXhixq9YKA== X-Received: by 2002:a05:600c:3b15:b0:3eb:3986:9c03 with SMTP id m21-20020a05600c3b1500b003eb39869c03mr5617718wms.4.1678553480455; Sat, 11 Mar 2023 08:51:20 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id m5-20020adffe45000000b002c5801aa9b0sm2929633wrs.40.2023.03.11.08.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 08:51:19 -0800 (PST) From: Simon Tournier Date: Sat, 11 Mar 2023 17:51:10 +0100 Message-Id: <20230311165110.726639-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230307171833.4170067-1-zimon.toutoune@gmail.com> References: <20230307171833.4170067-1-zimon.toutoune@gmail.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/packages.scm (package-direct-sources): Return 'origin' from 'patches'. * tests/packages.scm: Test it. --- guix/packages.scm | 10 ++++++++-- tests/packages.scm | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) base-commit: 7376424844e0dc1103a9d86799c2fb9bd4aa35eb diff --git a/guix/packages.scm b/guix/packages.scm index 041a872f9d..7b098e21f0 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022 jgart +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -1239,8 +1240,13 @@ (define-syntax modify-inputs (define (package-direct-sources package) "Return all source origins associated with PACKAGE; including origins in -PACKAGE's inputs." - `(,@(or (and=> (package-source package) list) '()) +PACKAGE's inputs and patches." + (define (expand source) + (cons + source + (filter origin? (origin-patches source)))) + + `(,@(or (and=> (package-source package) expand) '()) ,@(filter-map (match-lambda ((_ (? origin? orig) _ ...) orig) diff --git a/tests/packages.scm b/tests/packages.scm index f58c47817b..27fb918f90 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -418,12 +419,15 @@ (define read-at (let* ((o (dummy-origin)) (u (dummy-origin)) (i (dummy-origin)) + (j (dummy-origin (patches (list o)))) (a (dummy-package "a")) (b (dummy-package "b" (inputs (list a i)))) (c (package (inherit b) (source o))) (d (dummy-package "d" (build-system trivial-build-system) - (source u) (inputs (list c))))) + (source u) (inputs (list c)))) + (e (dummy-package "e" (source j))) + (f (package (inherit e) (inputs (list u))))) (test-assert "package-direct-sources, no source" (null? (package-direct-sources a))) (test-equal "package-direct-sources, #f source" @@ -437,6 +441,17 @@ (define read-at (and (= (length (pk 's-sources s)) 2) (member o s) (member i s)))) + (test-assert "package-direct-sources, with patches" + (let ((s (package-direct-sources e))) + (and (= (length (pk 's-sources s)) 2) + (member o s) + (member j s)))) + (test-assert "package-direct-sources, with patches and inputs" + (let ((s (package-direct-sources f))) + (and (= (length (pk 's-sources s)) 3) + (member o s) + (member j s) + (member u s)))) (test-assert "package-transitive-sources" (let ((s (package-transitive-sources d))) (and (= (length (pk 'd-sources s)) 3)