ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 14:28:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refresh: Fix sorting of updates by file and line number.

Browse source 
* guix/scripts/refresh.scm (guix-refresh): Add cascade-sort procedure and use
it to sort specs by package location.
This commit is contained in:
Ricardo Wurmus 2023-10-05 12:58:43 +02:00
parent 044a76c280
commit 3fba8cd274
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
guix/scripts/refresh.scm
View file

@ -571,6 +571,28 @@ (define (options->updaters opts)
(lists
(concatenate lists))))
;; Sort SEQUENCE by consecutive application of all tests to selected
;; elements in SEQUENCE. Every item in LESS+SELECT is a pair consisting of
;; a binary comparison procedure and a selector, e.g (cons < car).
(define (cascade-sort sequence . less+select)
(define (make-test less? select)
(lambda (a b)
(less? (select a) (select b))))
(define (combine-tests procs)
(lambda (a b)
(eq? 'less
(any (lambda (test)
(cond
((test a b) 'less)
((test b a) 'greater)
(else #false)))
procs))))
(let ((tests (match less+select
(((less? . select) ...)
(combine-tests
(map make-test less? select))))))
(sort sequence tests)))
(let* ((opts (parse-options))
(update? (assoc-ref opts 'update?))
(updaters (options->updaters opts))
@ -605,18 +627,21 @@ (define (options->updaters opts)
(or (assoc-ref opts 'keyring)
(string-append (config-directory)
"/upstream/trustedkeys.kbx"))))
(let* ((spec-line
(compose (cut string-trim-right <> char-set:digit)
location->string
package-location
(let* ((spec->location
(compose package-location
update-spec-package))
;; Sort the specs so that we update packages from the
;; bottom of the file to the top. This way we can be
;; sure that the package locations are always correct
;; and never shifted due to previous edits.
(sorted-update-specs
(sort update-specs
(lambda (a b) (string> (spec-line a) (spec-line b))))))
(cascade-sort update-specs
(cons string<
(compose location-file
spec->location))
(cons >
(compose location-line
spec->location)))))
(for-each
(lambda (update)
(update-package store