summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHilton Chain <hako@ultrarare.space>2026-04-13 16:54:27 +0800
committerHilton Chain <hako@ultrarare.space>2026-05-01 23:41:49 +0800
commitb1fd31c9e4add385c2ec33fc73009f1e3632987c (patch)
tree5fceec846f9fd21e1c6fc1d283609695b7aeeb14
parenta3f4e7bff779da4593a2922516064a8edaafa3e6 (diff)
nongnu: corrupt-linux: Inherit patches from Guix.
* nongnu/packages/linux.scm (corrupt-linux): Use kernel patches from Guix, except %boot-logo-patch. * NEWS (2026-05): Mention it.
-rw-r--r--NEWS5
-rw-r--r--nongnu/packages/linux.scm8
2 files changed, 11 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 037e426..6bf4d3d 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,11 @@
# Copyright © 2026 Hilton Chain <hako@ultrarare.space>
#+TITLE: NEWS about user visible changes of nonguix
+* 2026-05
+*** Linux: Inherit kernel patches from Guix
+These are patches applied to linux-libre-* packages. Previously they were
+ignored in linux-* packages.
+
* 2026-04
*** NVIDIA: New #:dynamic-boost? argument for nonguix-transformation-nvidia
The feature is supported on laptops since Ampere. For detailed introduction and
diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm
index cf89ec3..c479ca6 100644
--- a/nongnu/packages/linux.scm
+++ b/nongnu/packages/linux.scm
@@ -140,7 +140,10 @@ some freedo package or an output of package-version procedure."
(pristine-source (package-source freedo))
(inputs (map gexp-input-thing (extract-gexp-inputs pristine-source)))
(sources (filter origin? inputs))
- (hash (find-source-hash sources url)))
+ (hash (find-source-hash sources url))
+ (patches
+ (delete (@@ (gnu packages linux) %boot-logo-patch)
+ (origin-patches pristine-source))))
(package
(inherit
(customize-linux
@@ -168,7 +171,8 @@ some freedo package or an output of package-version procedure."
#:source (origin
(method url-fetch)
(uri url)
- (hash hash))
+ (hash hash)
+ (patches patches))
#:configs configs
#:defconfig defconfig
#:modconfig modconfig))