summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelle Licht <jlicht@fsfe.org>2025-09-19 13:26:35 +0200
committerJelle Licht <jlicht@fsfe.org>2025-09-19 13:27:34 +0200
commitbc2a73d7a8252b14a2a3705f8df791ab314f5a5c (patch)
tree5f33d4cca8a492dac9a615bd33c2120adfe96f6e
parentde297a2a28577651cbe27ba58f8b9ea8912392b0 (diff)
nongnu: linux-firmware: Update to 20250917.update-and-fix-linux-firmware
* nongnu/packages/linux.scm (linux-firmware): Update to 20250917. (select-firmware): Handle the Link keyword correctly. (iwlwifi-firmware)[arguments]{phases}: In the select-firmware phase, use new location of firmware.
-rw-r--r--nongnu/packages/linux.scm13
1 files changed, 8 insertions, 5 deletions
diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm
index 1c458be..a12c056 100644
--- a/nongnu/packages/linux.scm
+++ b/nongnu/packages/linux.scm
@@ -361,14 +361,14 @@ stable, responsive and smooth desktop experience.")))
361(define-public linux-firmware 361(define-public linux-firmware
362 (package 362 (package
363 (name "linux-firmware") 363 (name "linux-firmware")
364 (version "20250808") 364 (version "20250917")
365 (source (origin 365 (source (origin
366 (method url-fetch) 366 (method url-fetch)
367 (uri (string-append "mirror://kernel.org/linux/kernel/firmware/" 367 (uri (string-append "mirror://kernel.org/linux/kernel/firmware/"
368 "linux-firmware-" version ".tar.xz")) 368 "linux-firmware-" version ".tar.xz"))
369 (sha256 369 (sha256
370 (base32 370 (base32
371 "0zw3vsmd07yr27y5fz0m357hci00ah5impx5sz4jcnd18ldmaaf0")))) 371 "0xgvb0fb4s48423asdb1dnkjjskbfmm336gm6vki2nliasvpa18j"))))
372 (build-system gnu-build-system) 372 (build-system gnu-build-system)
373 (arguments 373 (arguments
374 (list #:tests? #f 374 (list #:tests? #f
@@ -415,8 +415,11 @@ if your hardware is supported by one of the smaller firmware packages.")
415 #~(lambda _ 415 #~(lambda _
416 (use-modules (ice-9 regex)) 416 (use-modules (ice-9 regex))
417 (substitute* "WHENCE" 417 (substitute* "WHENCE"
418 (("^(File|RawFile|Link): *([^ ]*)(.*)" _ type file rest) 418 (("^(File|RawFile): *([^ ]*)(.*)" _ type file rest)
419 (string-append (if (string-match #$keep file) type "Skip") ": " file rest))))) 419 (string-append (if (string-match #$keep file) type "Skip") ": " file rest))
420 (("^Link: *(.*) *-> *(.*)" _ file target)
421 (string-append (if (string-match #$keep target) "Link" "Skip")
422 ": " file " -> " target)))))
420 423
421(define-public amdgpu-firmware 424(define-public amdgpu-firmware
422 (package 425 (package
@@ -705,7 +708,7 @@ laptops).")
705 ((#:phases phases #~%standard-phases) 708 ((#:phases phases #~%standard-phases)
706 #~(modify-phases #$phases 709 #~(modify-phases #$phases
707 (add-after 'unpack 'select-firmware 710 (add-after 'unpack 'select-firmware
708 #$(select-firmware "^iwlwifi-"))))))) 711 #$(select-firmware "^intel/iwlwifi/")))))))
709 (home-page "https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi") 712 (home-page "https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi")
710 (synopsis "Nonfree firmware for Intel wifi chips") 713 (synopsis "Nonfree firmware for Intel wifi chips")
711 (description "The proprietary iwlwifi kernel module is required by many 714 (description "The proprietary iwlwifi kernel module is required by many