diff --git a/rosenthal/packages/linux.scm b/rosenthal/packages/linux.scm index 2eae000..16894b6 100644 --- a/rosenthal/packages/linux.scm +++ b/rosenthal/packages/linux.scm @@ -41,7 +41,7 @@ (define config->string (@@ (gnu packages linux) config->string)) -(define %xanmod-version "6.1.10") +(define %xanmod-version "6.1.11") (define %xanmod-revision "xanmod1") (define %hardened-version "6.1.10") @@ -54,10 +54,8 @@ "https://github.com/xanmod/linux/releases/download/" %xanmod-version "-" %xanmod-revision "/patch-" %xanmod-version "-" %xanmod-revision ".xz")) - (file-name - (string-append "linux-" %xanmod-version "-" %xanmod-revision ".patch")) (sha256 - (base32 "0967cxpaa96m1xfqr3kl7ldb1kl5y09ck4165qqi0vlx26rvyc1f")))) + (base32 "0qb6cmf6pjp4k4yk1nbsd9klnynharhyma2lzpnk9imm6mx3dqap")))) (define linux-hardened-patch (origin diff --git a/rosenthal/utils/download.scm b/rosenthal/utils/download.scm index 283367e..10397e5 100644 --- a/rosenthal/utils/download.scm +++ b/rosenthal/utils/download.scm @@ -13,10 +13,13 @@ (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." + #: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 _ ...) @@ -27,13 +30,13 @@ (module-ref (resolve-interface '(gnu packages compression)) 'xz)) (mlet %store-monad ((drv (url-fetch* url hash-algo hash - (or name file-name) + (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 tarball doesn't depend on - ;; whether grafts are enabled. + ;; 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