nongnu: linux-firmware: Switch to gexps.

* nongnu/packages/linux.scm (linux-firmware, amd-microcode, amdgpu-firmware,
atheros-firmware, i915-firmware, ibt-hw-firmware, iwlwifi-firmware,
radeon-firmware, realtek-firmware): Switch to gexps.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Timotej Lazar 2024-03-29 22:58:21 +01:00 committed by Jonathan Brielmaier
parent 34dec82fa9
commit d6dbbc3a55
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F

View file

@ -329,14 +329,14 @@ stable, responsive and smooth desktop experience.")))
"152bpl3lzd7jb2z1cl1sfax6jm71bspn7bwc00lci5qqmma7lcmj")))) "152bpl3lzd7jb2z1cl1sfax6jm71bspn7bwc00lci5qqmma7lcmj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f (list #:tests? #f
#:strip-binaries? #f #:strip-binaries? #f
#:validate-runpath? #f #:validate-runpath? #f
#:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out"))) #:make-flags #~(list (string-append "DESTDIR=" #$output))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'install (replace 'install
(lambda* (#:key (make-flags '()) #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "install-nodedup" make-flags)))))) (apply invoke "make" "install-nodedup" make-flags))))))
(home-page (home-page
"https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git") "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git")
@ -351,23 +351,23 @@ if your hardware is supported by one of the smaller firmware packages.")
(define (select-firmware keep) (define (select-firmware keep)
"Modify linux-firmware copy list to retain only files matching KEEP regex." "Modify linux-firmware copy list to retain only files matching KEEP regex."
`(lambda _ #~(lambda _
(use-modules (ice-9 regex)) (use-modules (ice-9 regex))
(substitute* "WHENCE" (substitute* "WHENCE"
(("^(File|RawFile|Link): *([^ ]*)(.*)" _ type file rest) (("^(File|RawFile|Link): *([^ ]*)(.*)" _ type file rest)
(string-append (if (string-match ,keep file) type "Skip") ": " file rest))))) (string-append (if (string-match #$keep file) type "Skip") ": " file rest)))))
(define-public amdgpu-firmware (define-public amdgpu-firmware
(package (package
(inherit linux-firmware) (inherit linux-firmware)
(name "amdgpu-firmware") (name "amdgpu-firmware")
(arguments (arguments
`(#:license-file-regexp "LICENSE.amdgpu" (cons* #:license-file-regexp "LICENSE.amdgpu"
,@(substitute-keyword-arguments (package-arguments linux-firmware) (substitute-keyword-arguments (package-arguments linux-firmware)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'select-firmware (add-after 'unpack 'select-firmware
,(select-firmware "^amdgpu/"))))))) #$(select-firmware "^amdgpu/")))))))
(home-page "http://support.amd.com/en-us/download/linux") (home-page "http://support.amd.com/en-us/download/linux")
(synopsis "Nonfree firmware for AMD graphics chips") (synopsis "Nonfree firmware for AMD graphics chips")
(description "Nonfree firmware for AMD graphics chips. While most AMD (description "Nonfree firmware for AMD graphics chips. While most AMD
@ -385,12 +385,12 @@ advanced 3D.")
(inherit amdgpu-firmware) (inherit amdgpu-firmware)
(name "radeon-firmware") (name "radeon-firmware")
(arguments (arguments
`(#:license-file-regexp "LICENSE.radeon" (cons* #:license-file-regexp "LICENSE.radeon"
,@(substitute-keyword-arguments (package-arguments linux-firmware) (substitute-keyword-arguments (package-arguments linux-firmware)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'select-firmware (add-after 'unpack 'select-firmware
,(select-firmware "^radeon/"))))))) #$(select-firmware "^radeon/")))))))
(synopsis "Nonfree firmware for older AMD graphics chips") (synopsis "Nonfree firmware for older AMD graphics chips")
(description "Nonfree firmware for AMD graphics chips. While most AMD (description "Nonfree firmware for AMD graphics chips. While most AMD
graphics cards can be run with the free Mesa, some cards require a nonfree graphics cards can be run with the free Mesa, some cards require a nonfree
@ -442,12 +442,12 @@ and modules, userspace libraries, and bootloader/GPU firmware.")
(inherit linux-firmware) (inherit linux-firmware)
(name "atheros-firmware") (name "atheros-firmware")
(arguments (arguments
`(#:license-file-regexp "LICEN[CS]E.*[Aa]th" (cons* #:license-file-regexp "LICEN[CS]E.*[Aa]th"
,@(substitute-keyword-arguments (package-arguments linux-firmware) (substitute-keyword-arguments (package-arguments linux-firmware)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'select-firmware (add-after 'unpack 'select-firmware
,(select-firmware "^(ar[3579]|ath[1369]|htc_[79]|qca/|wil6)"))))))) #$(select-firmware "^(ar[3579]|ath[1369]|htc_[79]|qca/|wil6)")))))))
(synopsis "Nonfree firmware blobs for Atheros wireless cards") (synopsis "Nonfree firmware blobs for Atheros wireless cards")
(description "Nonfree firmware blobs for Atheros wireless cards. This (description "Nonfree firmware blobs for Atheros wireless cards. This
package contains nonfree firmware for the following chips: package contains nonfree firmware for the following chips:
@ -618,12 +618,12 @@ WLAN.TF.2.1-00021-QCARMSWP-1 (ath10k/QCA9377/hw1.0/firmware-6.bin)
(inherit linux-firmware) (inherit linux-firmware)
(name "ibt-hw-firmware") (name "ibt-hw-firmware")
(arguments (arguments
`(#:license-file-regexp "LICENCE.ibt_firmware" (cons* #:license-file-regexp "LICENCE.ibt_firmware"
,@(substitute-keyword-arguments (package-arguments linux-firmware) (substitute-keyword-arguments (package-arguments linux-firmware)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'select-firmware (add-after 'unpack 'select-firmware
,(select-firmware "^intel/ibt-"))))))) #$(select-firmware "^intel/ibt-")))))))
(home-page "http://www.intel.com/support/wireless/wlan/sb/CS-016675.htm") (home-page "http://www.intel.com/support/wireless/wlan/sb/CS-016675.htm")
(synopsis "Non-free firmware for Intel bluetooth chips") (synopsis "Non-free firmware for Intel bluetooth chips")
(description "This firmware is required by the btintel kernel module to (description "This firmware is required by the btintel kernel module to
@ -639,12 +639,12 @@ laptops).")
(inherit linux-firmware) (inherit linux-firmware)
(name "iwlwifi-firmware") (name "iwlwifi-firmware")
(arguments (arguments
`(#:license-file-regexp "LICENCE.iwlwifi_firmware" (cons* #:license-file-regexp "LICENCE.iwlwifi_firmware"
,@(substitute-keyword-arguments (package-arguments linux-firmware) (substitute-keyword-arguments (package-arguments linux-firmware)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'select-firmware (add-after 'unpack 'select-firmware
,(select-firmware "^iwlwifi-"))))))) #$(select-firmware "^iwlwifi-")))))))
(home-page "https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi") (home-page "https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi")
(synopsis "Nonfree firmware for Intel wifi chips") (synopsis "Nonfree firmware for Intel wifi chips")
(description "The proprietary iwlwifi kernel module is required by many (description "The proprietary iwlwifi kernel module is required by many
@ -660,12 +660,12 @@ support for 5GHz and 802.11ac, among others.")
(inherit linux-firmware) (inherit linux-firmware)
(name "i915-firmware") (name "i915-firmware")
(arguments (arguments
`(#:license-file-regexp "LICENCE.i915" (cons* #:license-file-regexp "LICENCE.i915"
,@(substitute-keyword-arguments (package-arguments linux-firmware) (substitute-keyword-arguments (package-arguments linux-firmware)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'select-firmware (add-after 'unpack 'select-firmware
,(select-firmware "^i915/"))))))) #$(select-firmware "^i915/")))))))
(home-page "https://01.org/linuxgraphics/gfx-docs/drm/gpu/i915.html") (home-page "https://01.org/linuxgraphics/gfx-docs/drm/gpu/i915.html")
(synopsis "Nonfree firmware for Intel integrated graphics") (synopsis "Nonfree firmware for Intel integrated graphics")
(description "This package contains the various firmware for Intel (description "This package contains the various firmware for Intel
@ -680,13 +680,12 @@ integrated graphics chipsets, including GuC, HuC and DMC.")
(inherit linux-firmware) (inherit linux-firmware)
(name "realtek-firmware") (name "realtek-firmware")
(arguments (arguments
`(#:license-file-regexp "LICENCE.rtlwifi_firmware.txt" (cons* #:license-file-regexp "LICENCE.rtlwifi_firmware.txt"
,@(substitute-keyword-arguments (package-arguments linux-firmware) (substitute-keyword-arguments (package-arguments linux-firmware)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'select-firmware (add-after 'unpack 'select-firmware
,(select-firmware #$(select-firmware "^(rtlwifi|rtl_nic|rtl_bt|rtw88|rtw89)/")))))))
"^(rtlwifi|rtl_nic|rtl_bt|rtw88|rtw89)/")))))))
(home-page "https://wireless.wiki.kernel.org/en/users/drivers/rtl819x") (home-page "https://wireless.wiki.kernel.org/en/users/drivers/rtl819x")
(synopsis "Nonfree firmware for Realtek ethernet, wifi, and bluetooth chips") (synopsis "Nonfree firmware for Realtek ethernet, wifi, and bluetooth chips")
(description (description
@ -1227,12 +1226,12 @@ your CPU.")
(inherit linux-firmware) (inherit linux-firmware)
(name "amd-microcode") (name "amd-microcode")
(arguments (arguments
`(#:license-file-regexp "LICENSE.amd-ucode" (cons* #:license-file-regexp "LICENSE.amd-ucode"
,@(substitute-keyword-arguments (package-arguments linux-firmware) (substitute-keyword-arguments (package-arguments linux-firmware)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'select-firmware (add-after 'unpack 'select-firmware
,(select-firmware "^amd-ucode/"))))))) #$(select-firmware "^amd-ucode/")))))))
(synopsis "Processor microcode firmware for AMD CPUs") (synopsis "Processor microcode firmware for AMD CPUs")
(description "Updated system processor microcode for AMD x86-64 (description "Updated system processor microcode for AMD x86-64
processors. AMD releases microcode updates to correct processor behavior as processors. AMD releases microcode updates to correct processor behavior as