04/10: packages: Remove 'find-newest-available-packages'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e2a903c807ccacec5925f197ce26f626060e1953
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jan 11 15:19:41 2019 +0100

    packages: Remove 'find-newest-available-packages'.
    
    Since commit 9ffc1c00e55eb7931846dbb3fafcf54716fff57c,
    'find-newest-available-packages' and 'find-packages-by-name' were both
    building a vhash mapping package names to packages.  This factorizes
    this bit, also reducing I/O, CPU, and memory usage.
    
    * gnu/packages.scm (find-best-packages-by-name): Remove.
    (find-best-packages-by-name): Use 'find-packages-by-name' instead of
    'find-newest-available-packages'.
---
 gnu/packages.scm | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/gnu/packages.scm b/gnu/packages.scm
index 5322972..4a85cf4 100644
--- a/gnu/packages.scm
+++ b/gnu/packages.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
<address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2013 Mark H Weaver <address@hidden>
 ;;; Copyright © 2014 Eric Bavier <address@hidden>
 ;;; Copyright © 2016, 2017 Alex Kost <address@hidden>
@@ -53,7 +53,6 @@
 
             find-packages-by-name
             find-best-packages-by-name
-            find-newest-available-packages
 
             specification->package
             specification->package+output
@@ -203,38 +202,21 @@ decreasing version order."
                     matching)
             matching)))))
 
-(define find-newest-available-packages
-  (mlambda ()
-    "Return a vhash keyed by package names, and with
-associated values of the form
-
-  (newest-version newest-package ...)
-
-where the preferred package is listed first."
-
-    ;; FIXME: Currently, the preferred package is whichever one
-    ;; was found last by 'fold-packages'.  Find a better solution.
-    (fold-packages (lambda (p r)
-                     (let ((name    (package-name p))
-                           (version (package-version p)))
-                       (match (vhash-assoc name r)
-                         ((_ newest-so-far . pkgs)
-                          (case (version-compare version newest-so-far)
-                            ((>) (vhash-cons name `(,version ,p) r))
-                            ((=) (vhash-cons name `(,version ,p ,@pkgs) r))
-                            ((<) r)))
-                         (#f (vhash-cons name `(,version ,p) r)))))
-                   vlist-null)))
-
 (define (find-best-packages-by-name name version)
   "If version is #f, return the list of packages named NAME with the highest
 version numbers; otherwise, return the list of packages named NAME and at
 VERSION."
   (if version
       (find-packages-by-name name version)
-      (match (vhash-assoc name (find-newest-available-packages))
-        ((_ version pkgs ...) pkgs)
-        (#f '()))))
+      (match (find-packages-by-name name)
+        (()
+         '())
+        ((matches ...)
+         ;; Return the subset of MATCHES with the higher version number.
+         (let ((highest (package-version (first matches))))
+           (take-while (lambda (p)
+                         (string=? (package-version p) highest))
+                       matches))))))
 
 
 (define %sigint-prompt