From 17106e7ed3d21544dfd80e77aa785e1e5781fb1c Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 1 Jul 2023 10:40:23 +0800 Subject: [PATCH] rosenthal: Remove linux-xanmod. * rosenthal/packages/linux.scm (%default-extra-linux-options,config->string) (make-linux-xanmod-source,make-linux-xanmod,linux-xanmod-version) (linux-xanmod-revision,linux-xanmod-source,linux-xanmod): Delete variables. * README.org: Adjusted accordingly. --- README.org | 2 +- rosenthal/packages/linux.scm | 91 ------------------------------------ 2 files changed, 1 insertion(+), 92 deletions(-) diff --git a/README.org b/README.org index ee4be7f..53dc1d6 100644 --- a/README.org +++ b/README.org @@ -111,7 +111,7 @@ Rosenthal 頻道定義如下,將其加入 =~/.config/guix/channels.scm= 以由 + emacs-wakatime-mode + grimblast + hyprland -+ linux-xanmod ++ qbittorrent-enhanced + qogir-icon-theme *** Services / 服務 diff --git a/rosenthal/packages/linux.scm b/rosenthal/packages/linux.scm index 5a3d4d6..6ebd313 100644 --- a/rosenthal/packages/linux.scm +++ b/rosenthal/packages/linux.scm @@ -27,94 +27,3 @@ #:use-module (gnu packages python) #:use-module (gnu packages rsync) #:use-module (gnu packages tls)) - -(define %default-extra-linux-options - (@@ (gnu packages linux) %default-extra-linux-options)) - -(define config->string - (@@ (gnu packages linux) config->string)) - - -;;; -;;; Linux-XanMod -;;; - -(define (make-linux-xanmod-source version xanmod-revision hash-string) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/xanmod/linux/-/archive/" - version "-" xanmod-revision ".tar.bz2")) - (sha256 hash-string))) - -(define* (make-linux-xanmod version xanmod-revision source - #:key - (name "linux-xanmod") - (xanmod-defconfig "config_x86-64-v1")) - (let ((defconfig xanmod-defconfig) ;to be used in phases. - (base (customize-linux #:name name - #:source source - #:defconfig xanmod-defconfig - ;; EXTRAVERSION is used instead. - #:configs (config->string - '(("CONFIG_LOCALVERSION" . ""))) - #:extra-version xanmod-revision))) - (package - (inherit base) - (version version) - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) - #~(modify-phases #$phases - ;; EXTRAVERSION is used instead. - (add-after 'unpack 'remove-localversion - (lambda _ - (when (file-exists? "localversion") - (delete-file "localversion")))) - (add-before 'configure 'add-xanmod-defconfig - (lambda _ - (rename-file - (string-append "CONFIGS/xanmod/gcc/" #$defconfig) - ".config") - - ;; Adapted from `make-linux-libre*'. - (chmod ".config" #o666) - (let ((port (open-file ".config" "a")) - (extra-configuration - #$(config->string - ;; FIXME: There might be other support missing. - (append '(("CONFIG_BLK_DEV_NVME" . #t) - ("CONFIG_CRYPTO_XTS" . m) - ("CONFIG_VIRTIO_CONSOLE" . m)) - %default-extra-linux-options)))) - (display extra-configuration port) - (close-port port)) - (invoke "make" "oldconfig") - - (rename-file - ".config" - (string-append "arch/x86/configs/" #$defconfig)))))))) - (native-inputs - (modify-inputs (package-native-inputs base) - ;; cpio is needed for CONFIG_IKHEADERS. - (append cpio zstd))) - (home-page "https://xanmod.org/") - (supported-systems '("x86_64-linux")) - (synopsis - "Linux kernel distribution with custom settings and new features") - (description - "This package provides XanMod kernel, a general-purpose Linux kernel -distribution with custom settings and new features. It's built to provide a -stable, responsive and smooth desktop experience.")))) - -(define linux-xanmod-version "6.3.10") -(define linux-xanmod-revision "xanmod1") -(define linux-xanmod-source - (make-linux-xanmod-source - linux-xanmod-version - linux-xanmod-revision - (base32 "0gnbr37cxrhw4q6bydw8xza31sgj04hj0qxlva1gycw064p7fcxc"))) - -(define-public linux-xanmod - (make-linux-xanmod linux-xanmod-version - linux-xanmod-revision - linux-xanmod-source))