seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2026-03-25 19:24:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

bootloader: Deprecate grub-efi-luks2.

Browse Source 
GRUB in Guix has been updated to 2.14, which supports Argon2.

* modules/rosenthal/packages/bootloaders.scm (grub-efi-luks2)
* modules/rosenthal/bootloader/grub.scm (grub-efi-luks2-bootloader):
(grub-efi-luks2-removable-bootloader): Deprecate variables.
This commit is contained in:
Hilton Chain 2026-03-20 00:52:38 +08:00
parent 128c21d11a
commit a617e66a34
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
2 changed files with 6 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/rosenthal/bootloader/grub.scm
View File

@ -2,23 +2,12 @@
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
(define-module (rosenthal bootloader grub)
;; Utilities
#:use-module (guix deprecation)
;; Guix System - bootloaders
#:use-module (gnu bootloader)
#:use-module (gnu bootloader grub)
;; Guix packages
#:use-module (rosenthal packages bootloaders)
#:export (grub-efi-luks2-bootloader
grub-efi-luks2-removable-bootloader))
(define grub-efi-luks2-bootloader
(bootloader
(inherit grub-efi-bootloader)
;; NOTE: Don't change the name. Generation switching code only knows
;; bootloaders defined in (gnu bootloader grub).
(name 'grub-efi)
(package grub-efi-luks2)))
(define grub-efi-luks2-removable-bootloader
(bootloader
(inherit grub-efi-removable-bootloader)
(package grub-efi-luks2)))
(define-deprecated/alias grub-efi-luks2-bootloader grub-efi-bootloader)
(define-deprecated/alias grub-efi-luks2-removable-bootloader grub-efi-removable-bootloader)

42
modules/rosenthal/packages/bootloaders.scm
View File

@ -5,6 +5,7 @@
(define-module (rosenthal packages bootloaders)
#:use-module (srfi srfi-26)
;; Utilities
#:use-module (guix deprecation)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
@ -33,46 +34,7 @@
#:use-module (gnu packages python-xyz)
#:export (systemd-stub-name))
;; Patches obtained from:
;; <https://leo3418.github.io/collections/gentoo-config-luks2-grub-systemd/packages.html>
(define grub-luks2-argon2-support-patch
(origin
(method url-fetch)
(uri (string-append "https://leo3418.github.io/"
"res/collections/gentoo-config-luks2-grub-systemd/"
"grub-2.12-luks2-argon2-v4.patch"))
(sha256
(base32
"02y15k6rd5vj2shfijyhq2nr2775vpa55ijfy6bb8irpnh8i2272"))))
(define-public grub-efi-luks2
(let ((base grub-efi))
(package
(inherit base)
(name "grub-efi-luks2")
(source
(let ((base (package-source base)))
(origin
(inherit base)
(patches
(append (origin-patches base)
(list grub-luks2-argon2-support-patch))))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:configure-flags flags ''())
#~(append #$flags '("--disable-werror")))
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
(add-after 'unpack 'delete-configure-script
(lambda _
(delete-file "configure")))))))
(native-inputs
(modify-inputs (package-native-inputs base)
(append autoconf automake python-minimal-wrapper)))
(properties
`(,@(package-properties base)
(disable-updater? . #t))))))
(define-deprecated-package grub-efi-luks2 grub-efi)
(define-public limine
(package