amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

installer: Use "partitioning-page" consistently.

Browse source 
Having `partition-page' function call `RUN-partititionING-page' where all
other proxy functions call `RUN-<name>' hurts my brain while refactoring.

* gnu/installer/record.scm (<installer>)[partition-page]: Rename to...
[partitioning-page]: ...this.
* gnu/installer/newt.scm (partitioning-page, newt-installer): Update
accordingly.
* gnu/installer.scm (installer-steps): Update accordingly.

Change-Id: I6b2f3459a3d0a7a89260224b7d8438676e3411ba
This commit is contained in:
Janneke Nieuwenhuizen 2024-10-21 08:00:56 +02:00 • committed by Jan (janneke) Nieuwenhuizen
parent a08bb21376
commit 31f687f258
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gnu/installer.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -312,7 +313,7 @@ selected keymap."
(id 'partition) (id 'partition)
(description (G_ "Partitioning")) (description (G_ "Partitioning"))
(compute (lambda _ (compute (lambda _
((installer-partition-page current-installer)))) ((installer-partitioning-page current-installer))))
(configuration-formatter user-partitions->configuration)) (configuration-formatter user-partitions->configuration))
(installer-step (installer-step

5
gnu/installer/newt.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -193,7 +194,7 @@ report it by email to ~a.") uploaded-name %guix-bug-report-address)
(define (user-page) (define (user-page)
(run-user-page)) (run-user-page))
(define (partition-page) (define (partitioning-page)
(run-partitioning-page)) (run-partitioning-page))
(define (services-page) (define (services-page)
@ -220,7 +221,7 @@ report it by email to ~a.") uploaded-name %guix-bug-report-address)
(timezone-page timezone-page) (timezone-page timezone-page)
(hostname-page hostname-page) (hostname-page hostname-page)
(user-page user-page) (user-page user-page)
(partition-page partition-page) (partitioning-page partitioning-page)
(services-page services-page) (services-page services-page)
(welcome-page welcome-page) (welcome-page welcome-page)
(parameters-menu parameters-menu) (parameters-menu parameters-menu)

5
gnu/installer/record.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -37,7 +38,7 @@
installer-timezone-page installer-timezone-page
installer-hostname-page installer-hostname-page
installer-user-page installer-user-page
installer-partition-page installer-partitioning-page
installer-services-page installer-services-page
installer-welcome-page installer-welcome-page
installer-parameters-menu installer-parameters-menu
@ -86,7 +87,7 @@
;; procedure void -> void ;; procedure void -> void
(user-page installer-user-page) (user-page installer-user-page)
;; procedure void -> void ;; procedure void -> void
(partition-page installer-partition-page) (partitioning-page installer-partitioning-page)
;; procedure void -> void ;; procedure void -> void
(services-page installer-services-page) (services-page installer-services-page)
;; procedure (logo #:pci-database) -> void ;; procedure (logo #:pci-database) -> void