[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#23874: [PATCH 2/2] profiles: Delete duplicate manifest entries in pa
From: |
Leo Prikler |
Subject: |
bug#23874: [PATCH 2/2] profiles: Delete duplicate manifest entries in packages->manifest. |
Date: |
Wed, 2 Dec 2020 14:22:44 +0100 |
* gnu/profiles.scm (packages->manifest): Delete duplicate entries.
---
guix/profiles.scm | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 99b7dbf299..14b98852bd 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -399,22 +399,24 @@ denoting a specific output of a package."
'inferior-package->manifest-entry))
(manifest
- (map (match-lambda
- (((? package? package) output)
- (package->manifest-entry package output))
- ((? package? package)
- (package->manifest-entry package))
- ((thing output)
- (if inferiors-loaded?
- ((inferior->entry) thing output)
- (throw 'wrong-type-arg 'packages->manifest
- "Wrong package object: ~S" (list thing) (list thing))))
- (thing
- (if inferiors-loaded?
- ((inferior->entry) thing)
- (throw 'wrong-type-arg 'packages->manifest
- "Wrong package object: ~S" (list thing) (list thing)))))
- packages)))
+ (delete-duplicates
+ (map (match-lambda
+ (((? package? package) output)
+ (package->manifest-entry package output))
+ ((? package? package)
+ (package->manifest-entry package))
+ ((thing output)
+ (if inferiors-loaded?
+ ((inferior->entry) thing output)
+ (throw 'wrong-type-arg 'packages->manifest
+ "Wrong package object: ~S" (list thing) (list thing))))
+ (thing
+ (if inferiors-loaded?
+ ((inferior->entry) thing)
+ (throw 'wrong-type-arg 'packages->manifest
+ "Wrong package object: ~S" (list thing) (list thing)))))
+ packages)
+ manifest-entry=?)))
(define (manifest->gexp manifest)
"Return a representation of MANIFEST as a gexp."
--
2.29.2
- bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions., Leo Prikler, 2020/12/02
- bug#23874: [PATCH 2/2] profiles: Delete duplicate manifest entries in packages->manifest.,
Leo Prikler <=
- bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions., Mark H Weaver, 2020/12/02
- bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions., Leo Prikler, 2020/12/02
- bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions., zimoun, 2020/12/02
- bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions., Ludovic Courtès, 2020/12/05
- bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions., Leo Prikler, 2020/12/05
- bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions., Ludovic Courtès, 2020/12/07
- bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions., zimoun, 2020/12/07