diff options
| author | Jonathan Brielmaier <jonathan.brielmaier@web.de> | 2025-01-11 17:56:01 +0100 |
|---|---|---|
| committer | Jonathan Brielmaier <jonathan.brielmaier@web.de> | 2025-01-11 17:56:01 +0100 |
| commit | 565d287b7502ef9435b2fba38622d0a8f458677b (patch) | |
| tree | 6af9c549274293165c76098dbe76113b60a85ab4 | |
| parent | f6c03eefeb475684e758275d8b959acc8adf79d6 (diff) | |
nongnu: broadcom-sta: Fix build for linux@6.12.
We do not need to rename the patches as Software Heritage keeps the old
ones from nixpkgs repo available.
* nongnu/packages/linux.scm (broadcom-sta-patch): Use rpmfusion repo as
nixpkgs no longer maintains those patches.
(broadcom-sta-x86_64-source): Add patch for linux@6.12 and update a
comment.
| -rw-r--r-- | nongnu/packages/linux.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm index 7fa21f1..8b74ca2 100644 --- a/nongnu/packages/linux.scm +++ b/nongnu/packages/linux.scm | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> | 4 | ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> |
| 5 | ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si> | 5 | ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si> |
| 6 | ;;; Copyright © 2020, 2021 James Smith <jsubuntuxp@disroot.org> | 6 | ;;; Copyright © 2020, 2021 James Smith <jsubuntuxp@disroot.org> |
| 7 | ;;; Copyright © 2020-2024 Jonathan Brielmaier <jonathan.brielmaier@web.de> | 7 | ;;; Copyright © 2020-2025 Jonathan Brielmaier <jonathan.brielmaier@web.de> |
| 8 | ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de> | 8 | ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de> |
| 9 | ;;; Copyright © 2020, 2021, 2022 Tobias Geerinckx-Rice <me@tobias.gr> | 9 | ;;; Copyright © 2020, 2021, 2022 Tobias Geerinckx-Rice <me@tobias.gr> |
| 10 | ;;; Copyright © 2020, 2021, 2022 Zhu Zihao <all_but_last@163.com> | 10 | ;;; Copyright © 2020, 2021, 2022 Zhu Zihao <all_but_last@163.com> |
| @@ -1095,9 +1095,9 @@ giving you trouble, you can try this module.") | |||
| 1095 | (define (broadcom-sta-patch name commit hash) | 1095 | (define (broadcom-sta-patch name commit hash) |
| 1096 | (origin | 1096 | (origin |
| 1097 | (method url-fetch) | 1097 | (method url-fetch) |
| 1098 | (uri (string-append "https://raw.githubusercontent.com/NixOS/nixpkgs/" | 1098 | (uri (string-append "https://raw.githubusercontent.com/rpmfusion/wl-kmod/" |
| 1099 | commit | 1099 | commit |
| 1100 | "/pkgs/os-specific/linux/broadcom-sta/" | 1100 | "wl-kmod-" |
| 1101 | name | 1101 | name |
| 1102 | ".patch")) | 1102 | ".patch")) |
| 1103 | (sha256 | 1103 | (sha256 |
| @@ -1112,12 +1112,12 @@ giving you trouble, you can try this module.") | |||
| 1112 | (string-replace-substring broadcom-sta-version "." "_") | 1112 | (string-replace-substring broadcom-sta-version "." "_") |
| 1113 | ".tar.gz")) | 1113 | ".tar.gz")) |
| 1114 | (patches | 1114 | (patches |
| 1115 | ;; Keep these in sync with the list at | 1115 | ;; Keep these in sync with the patches at |
| 1116 | ;; https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/broadcom-sta. | 1116 | ;; https://github.com/rpmfusion/wl-kmod |
| 1117 | ;; Nixpkgs is good about keeping broadcom patches up to date so updating | 1117 | ;; They seem to be good about keeping broadcom patches up to date so updating |
| 1118 | ;; for a new kernel release should be as simple as chaging the commit to | 1118 | ;; for a new kernel release should be as simple as chaging the commit to |
| 1119 | ;; the newest available and adding any new patches. | 1119 | ;; the newest available and adding any new patches. |
| 1120 | (let ((commit "355042e2ff5933b245e804c5eaff4ec3f340e71b")) | 1120 | (let ((commit "cb67598cbf5d8c5260b750d6f7e5c6a6599b7b85")) |
| 1121 | (list | 1121 | (list |
| 1122 | (broadcom-sta-patch "i686-build-failure" commit "1522w2gb698svlkb2b4lijbd740agvs2ibpz4g0jlv8v31cybkf4") | 1122 | (broadcom-sta-patch "i686-build-failure" commit "1522w2gb698svlkb2b4lijbd740agvs2ibpz4g0jlv8v31cybkf4") |
| 1123 | (broadcom-sta-patch "license" commit "0rwlhafcmpp97cknqwv8gwf8sbxgqavgci1ywfkdxiylh4mhcvhr") | 1123 | (broadcom-sta-patch "license" commit "0rwlhafcmpp97cknqwv8gwf8sbxgqavgci1ywfkdxiylh4mhcvhr") |
| @@ -1135,7 +1135,9 @@ giving you trouble, you can try this module.") | |||
| 1135 | (broadcom-sta-patch "linux-6.1" commit "1pvx1h7iimcbfqdc13n1980ngxk9q6iyip8svn293x4h7jn472kf") | 1135 | (broadcom-sta-patch "linux-6.1" commit "1pvx1h7iimcbfqdc13n1980ngxk9q6iyip8svn293x4h7jn472kf") |
| 1136 | (broadcom-sta-patch "pedantic-fix" commit "1kxmw1iyxnfwad75h981sak5qk16p81xy1f2qxss2d0v97vkfkl5") | 1136 | (broadcom-sta-patch "pedantic-fix" commit "1kxmw1iyxnfwad75h981sak5qk16p81xy1f2qxss2d0v97vkfkl5") |
| 1137 | (broadcom-sta-patch "null-pointer-fix" commit "15c2vxgf7v5wy4s8w9jk7irf3fxxghy05gxmav1ss73a2azajdx7") | 1137 | (broadcom-sta-patch "null-pointer-fix" commit "15c2vxgf7v5wy4s8w9jk7irf3fxxghy05gxmav1ss73a2azajdx7") |
| 1138 | (broadcom-sta-patch "gcc" commit "0jcqk2vapyy2pbsjv9n8b3qp6vqz17d6s07cr04cx7075q7yhz5h")))) | 1138 | (broadcom-sta-patch "gcc" commit "0jcqk2vapyy2pbsjv9n8b3qp6vqz17d6s07cr04cx7075q7yhz5h") |
| 1139 | (broadcom-sta-patch "028_kernel_6.12_adaption" commit | ||
| 1140 | "154dhlb3vyq8bnx7f371scsrhp9cszvmqlswqg5vi6gfgbqnrq08")))) | ||
| 1139 | (sha256 | 1141 | (sha256 |
| 1140 | (base32 | 1142 | (base32 |
| 1141 | "1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz")))) | 1143 | "1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz")))) |
