[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/18: packages: Consider 'patches' by 'package-direct-sources'.
From: |
guix-commits |
Subject: |
01/18: packages: Consider 'patches' by 'package-direct-sources'. |
Date: |
Mon, 13 Mar 2023 10:11:10 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 9fb8a480d5aec9186908e92ad18b31455f4aab6b
Author: Simon Tournier <zimon.toutoune@gmail.com>
AuthorDate: Sat Mar 11 17:51:10 2023 +0100
packages: Consider 'patches' by 'package-direct-sources'.
* guix/packages.scm (package-direct-sources): Return 'origin' from
'patches'.
* tests/packages.scm: Test it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
guix/packages.scm | 10 ++++++++--
tests/packages.scm | 17 ++++++++++++++++-
2 files changed, 24 insertions(+), 3 deletions(-)
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 <cmmarusich@gmail.com>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1239,8 +1240,13 @@ input list."
(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 <janneke@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -418,12 +419,15 @@
(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 @@
(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)
- 11/18: gnu: font-iosevka: Update to 20.0.0., (continued)
- 11/18: gnu: font-iosevka: Update to 20.0.0., guix-commits, 2023/03/13
- 12/18: gnu: Add font-iosevka-ss08., guix-commits, 2023/03/13
- 13/18: gnu: Add font-iosevka-ss09., guix-commits, 2023/03/13
- 14/18: gnu: pumpa: Update upsream URL., guix-commits, 2023/03/13
- 15/18: doc: Fix incorrect @deffn usage for service-types., guix-commits, 2023/03/13
- 17/18: doc: Use @defun for procedures., guix-commits, 2023/03/13
- 16/18: doc: Fix incorrect @deffn usage for data types., guix-commits, 2023/03/13
- 02/18: system: Simplify nsswitch binding., guix-commits, 2023/03/13
- 03/18: system: Remove redundant gexp-ungexp usage., guix-commits, 2023/03/13
- 05/18: packages: Use SRFI-71 instead of SRFI-11., guix-commits, 2023/03/13
- 01/18: packages: Consider 'patches' by 'package-direct-sources'.,
guix-commits <=
- 07/18: guix: Strip #:use-module lists., guix-commits, 2023/03/13
- 09/18: gnu: rnp: Update to 0.16.2., guix-commits, 2023/03/13
- 18/18: doc: Use @defmac and @defspec for macros., guix-commits, 2023/03/13