branch master updated: website: Fix duplicated packages in the package-list

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository guix-artwork.

The following commit(s) were added to refs/heads/master by this push:
     new bfec2a3  website: Fix duplicated packages in the package-list
bfec2a3 is described below

commit bfec2a3208e5458aac1894843e607e42f00cd623
Author: Royce Strange <royball@disroot.org>
AuthorDate: Thu Jun 11 00:41:45 2020 -0500

    website: Fix duplicated packages in the package-list
    
    Fixes <https://bugs.gnu.org/36394>.
    
    * website/apps/packages/data.scm (%package-list):
    Filter out replaced packages.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 website/apps/packages/data.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/website/apps/packages/data.scm b/website/apps/packages/data.scm
index f1fa55d..d1bbc92 100644
--- a/website/apps/packages/data.scm
+++ b/website/apps/packages/data.scm
@@ -41,11 +41,10 @@
            (sort (parameterize ((%package-module-path (last-pair
                                                        
(%package-module-path))))
                    (fold-packages (lambda (package lst)
-                                    (if (package-superseded package)
+                                    (if (or (package-superseded package)
+                                            (package-replacement package))
                                         lst
-                                        (cons (or (package-replacement package)
-                                                  package)
-                                              lst)))
+                                        (cons package lst)))
                                   '()))
                  (lambda (p1 p2)
                    (string<? (package-name p1)