ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

upstream: update-package-inputs: Sort extra inputs.

Browse source 
Ensure that extra inputs end up in the correct order.

* guix/upstream.scm (update-package-inputs)[filtered-inputs]: Sort new list of
inputs.

Change-Id: Ia5fddd8103a33c79426995057fcce61c2e9e5a72
This commit is contained in:
Ricardo Wurmus 2024-02-19 11:44:47 +01:00
parent 9ce548a26e
commit 00c8a9275c
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
guix/upstream.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2010-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2010-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2019, 2022, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019, 2022-2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
@ -566,17 +566,21 @@ (define (filtered-inputs source-inputs extra-property ignore-property)
(properties (package-properties package)) (properties (package-properties package))
(ignore (or (assoc-ref properties ignore-property) '())) (ignore (or (assoc-ref properties ignore-property) '()))
(extra (or (assoc-ref properties extra-property) '()))) (extra (or (assoc-ref properties extra-property) '())))
(append (if (null? ignore) (sort
inputs (append (if (null? ignore)
(remove (lambda (input) inputs
(member (upstream-input-downstream-name input) (remove (lambda (input)
ignore)) (member (upstream-input-downstream-name input)
inputs)) ignore))
(map (lambda (name) inputs))
(upstream-input (map (lambda (name)
(name name) (upstream-input
(downstream-name name))) (name name)
extra))))) (downstream-name name)))
extra))
(lambda (a b)
(string-ci<? (upstream-input-downstream-name a)
(upstream-input-downstream-name b)))))))
(define regular-inputs (define regular-inputs
(filtered-inputs upstream-source-regular-inputs (filtered-inputs upstream-source-regular-inputs