diff --git a/rosenthal/packages/linux.scm b/rosenthal/packages/linux.scm index 151f09d..3a45a23 100644 --- a/rosenthal/packages/linux.scm +++ b/rosenthal/packages/linux.scm @@ -26,8 +26,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages rsync) - #:use-module (gnu packages tls) - #:use-module (rosenthal utils download)) + #:use-module (gnu packages tls)) (define %upstream-linux-source (@@ (gnu packages linux) %upstream-linux-source)) @@ -41,22 +40,12 @@ (define config->string (@@ (gnu packages linux) config->string)) -(define %xanmod-version "6.1.12") +(define %xanmod-version "6.1.13") (define %xanmod-revision "xanmod1") (define %hardened-version "6.1.12") (define %hardened-revision "hardened1") -(define linux-xanmod-patch - (origin - (method url-fetch/xz-file) - (uri (string-append - "https://github.com/xanmod/linux/releases/download/" - %xanmod-version "-" %xanmod-revision "/patch-" - %xanmod-version "-" %xanmod-revision ".xz")) - (sha256 - (base32 "1hk9gpjamn75wwgf5cphi7pd9wc4q8xvc8rzz0nidf7vv2dfv2rj")))) - (define linux-hardened-patch (origin (method url-fetch) @@ -68,11 +57,12 @@ (base32 "0nz2gz7nx0z9am8fldza28vj0fgp7hdx3skpm1xvdhgy8d35p33l")))) (define linux-xanmod-source - (source-with-patches (%upstream-linux-source - (version-major+minor %xanmod-version) - (base32 - "1ssxn81jfl0jf9brczfrrwd1f1vmf594jvhrs7zgcc54a5qg389c")) - (list linux-xanmod-patch))) + (origin + (method url-fetch) + (uri (string-append "https://github.com/xanmod/linux/archive/" + %xanmod-version "-" %xanmod-revision ".tar.gz")) + (sha256 + (base32 "1nm5jkjb7fis7fz2faszjd254a26di002w7x1gwxgjx0v8ncxp9l")))) (define linux-hardened-source (source-with-patches (%upstream-linux-source diff --git a/rosenthal/utils/download.scm b/rosenthal/utils/download.scm deleted file mode 100644 index 10397e5..0000000 --- a/rosenthal/utils/download.scm +++ /dev/null @@ -1,57 +0,0 @@ -;; SPDX-FileCopyrightText: 2023 Hilton Chain -;; -;; SPDX-License-Identifier: GPL-3.0-or-later - -(define-module (rosenthal utils download) - #:use-module (ice-9 match) - #:use-module (guix gexp) - #:use-module (guix packages) - #:use-module (guix store) - #:use-module (guix monads) - #:export (url-fetch/xz-file)) - -(define url-fetch* (@@ (guix download) url-fetch*)) - -(define* (url-fetch/xz-file url hash-algo hash - #:optional name - #:key (system (%current-system)) - (guile (default-guile))) - "Similar to 'url-fetch' but decompress the xz file at URL as the result. -This is mainly used for adding xz-compressed patches to a origin definition. - -\".xz\" extension in the URL is assumed." - (define file-name - (match url - ((head _ ...) - (basename head)) - (_ - (basename url)))) - (define xz - (module-ref (resolve-interface '(gnu packages compression)) 'xz)) - - (mlet %store-monad ((drv (url-fetch* url hash-algo hash - (or name (basename file-name ".xz")) - #:system system - #:guile guile)) - (guile (package->derivation guile system))) - ;; Take the xz file, and simply decompress it. - ;; Use ungrafted xz so that the resulting file doesn't depend on whether - ;; grafts are enabled. - (gexp->derivation (or name file-name) - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - (setenv "XZ_OPT" - (string-join (%xz-parallel-args))) - - (copy-file #$drv #$file-name) - (make-file-writable #$file-name) - (invoke (string-append #+xz "/bin/unxz") - #$file-name) - - (copy-file (basename #$file-name ".xz") - #$output))) - #:system system - #:guile-for-build guile - #:graft? #f - #:local-build? #t)))