From 03b1da5d9e68abf4574fbefd22435ceaf4c5bc58 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 18 Sep 2023 19:27:15 +0800 Subject: [PATCH] rosenthal: Remove extraneous imports. * rosenthal/bootloader/grub.scm: Remove extraneous imports. * rosenthal/packages/binaries.scm: Likewise. * rosenthal/packages/dns.scm: Likewise. * rosenthal/packages/emacs-xyz.scm: Likewise. * rosenthal/packages/freedesktop.scm: Likewise. * rosenthal/packages/networking.scm: Likewise. * rosenthal/packages/web.scm: Likewise. * rosenthal/packages/xdisorg.scm: Likewise. * rosenthal/services/networking.scm: Likewise. * rosenthal/packages/bittorrent.scm: Delete file. * rosenthal/packages/gnome-xyz.scm: Likewise. * rosenthal/packages/linux.scm: Likewise. --- rosenthal/bootloader/grub.scm | 1 - rosenthal/packages/binaries.scm | 1 - rosenthal/packages/bittorrent.scm | 12 ------------ rosenthal/packages/dns.scm | 3 +-- rosenthal/packages/emacs-xyz.scm | 3 +-- rosenthal/packages/freedesktop.scm | 3 --- rosenthal/packages/gnome-xyz.scm | 11 ----------- rosenthal/packages/linux.scm | 29 ----------------------------- rosenthal/packages/networking.scm | 2 -- rosenthal/packages/web.scm | 8 ++------ rosenthal/packages/xdisorg.scm | 3 --- rosenthal/services/networking.scm | 1 - 12 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 rosenthal/packages/bittorrent.scm delete mode 100644 rosenthal/packages/gnome-xyz.scm delete mode 100644 rosenthal/packages/linux.scm diff --git a/rosenthal/bootloader/grub.scm b/rosenthal/bootloader/grub.scm index e9c1f70..cb1b911 100644 --- a/rosenthal/bootloader/grub.scm +++ b/rosenthal/bootloader/grub.scm @@ -5,7 +5,6 @@ (define-module (rosenthal bootloader grub) #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) - #:use-module (gnu packages bootloaders) #:use-module (rosenthal packages bootloaders) #:export (grub-efi-luks2-bootloader)) diff --git a/rosenthal/packages/binaries.scm b/rosenthal/packages/binaries.scm index a7b64a5..4ab8ce7 100644 --- a/rosenthal/packages/binaries.scm +++ b/rosenthal/packages/binaries.scm @@ -6,7 +6,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix gexp) #:use-module (guix packages) - #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system copy) #:use-module (gnu packages base) diff --git a/rosenthal/packages/bittorrent.scm b/rosenthal/packages/bittorrent.scm deleted file mode 100644 index 29cd51d..0000000 --- a/rosenthal/packages/bittorrent.scm +++ /dev/null @@ -1,12 +0,0 @@ -;; SPDX-FileCopyrightText: 2022 Hilton Chain -;; -;; SPDX-License-Identifier: GPL-3.0-or-later - -(define-module (rosenthal packages bittorrent) - #:use-module (guix build-system cmake) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (gnu packages bittorrent) - #:use-module (gnu packages qt)) diff --git a/rosenthal/packages/dns.scm b/rosenthal/packages/dns.scm index dec8b2b..39a5195 100644 --- a/rosenthal/packages/dns.scm +++ b/rosenthal/packages/dns.scm @@ -7,8 +7,7 @@ #:use-module (guix build-system copy) #:use-module (guix gexp) #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix utils)) + #:use-module (guix packages)) (define-public dnsmasq-china-list ;; No version. diff --git a/rosenthal/packages/emacs-xyz.scm b/rosenthal/packages/emacs-xyz.scm index 6fb5c5a..4b4745a 100644 --- a/rosenthal/packages/emacs-xyz.scm +++ b/rosenthal/packages/emacs-xyz.scm @@ -7,8 +7,7 @@ #:use-module (guix build-system emacs) #:use-module (guix gexp) #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (gnu packages emacs-xyz)) + #:use-module (guix packages)) ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59552 (define-public emacs-wakatime-mode diff --git a/rosenthal/packages/freedesktop.scm b/rosenthal/packages/freedesktop.scm index 1ad2c35..d17af51 100644 --- a/rosenthal/packages/freedesktop.scm +++ b/rosenthal/packages/freedesktop.scm @@ -3,11 +3,8 @@ ;; SPDX-License-Identifier: GPL-3.0-or-later (define-module (rosenthal packages freedesktop) - #:use-module (guix download) - #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils) #:use-module (gnu packages check) #:use-module (gnu packages freedesktop) #:use-module (gnu packages python)) diff --git a/rosenthal/packages/gnome-xyz.scm b/rosenthal/packages/gnome-xyz.scm deleted file mode 100644 index 54a1fa1..0000000 --- a/rosenthal/packages/gnome-xyz.scm +++ /dev/null @@ -1,11 +0,0 @@ -;; SPDX-FileCopyrightText: 2022-2023 Hilton Chain -;; -;; SPDX-License-Identifier: GPL-3.0-or-later - -(define-module (rosenthal packages gnome-xyz) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system copy) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix utils)) diff --git a/rosenthal/packages/linux.scm b/rosenthal/packages/linux.scm deleted file mode 100644 index 6ebd313..0000000 --- a/rosenthal/packages/linux.scm +++ /dev/null @@ -1,29 +0,0 @@ -;; SPDX-FileCopyrightText: 2022-2023 Hilton Chain -;; -;; SPDX-License-Identifier: GPL-3.0-or-later - -(define-module (rosenthal packages linux) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (ice-9 match) - #:use-module (guix build-system) - #:use-module (guix build-system copy) - #:use-module (guix build-system gnu) - #:use-module (guix build-system python) - #:use-module (guix download) - #:use-module (guix gexp) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (gnu packages) - #:use-module (gnu packages base) - #:use-module (gnu packages compression) - #:use-module (gnu packages cpio) - #:use-module (gnu packages gawk) - #:use-module (gnu packages gcc) - #:use-module (gnu packages glib) - #:use-module (gnu packages linux) - #:use-module (gnu packages llvm) - #:use-module (gnu packages perl) - #:use-module (gnu packages python) - #:use-module (gnu packages rsync) - #:use-module (gnu packages tls)) diff --git a/rosenthal/packages/networking.scm b/rosenthal/packages/networking.scm index ba806f8..191c789 100644 --- a/rosenthal/packages/networking.scm +++ b/rosenthal/packages/networking.scm @@ -8,8 +8,6 @@ #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (gnu packages admin) #:use-module (gnu packages golang)) (define-public cloudflared diff --git a/rosenthal/packages/web.scm b/rosenthal/packages/web.scm index 3f63ca4..bf0f9e9 100644 --- a/rosenthal/packages/web.scm +++ b/rosenthal/packages/web.scm @@ -3,13 +3,9 @@ ;; SPDX-License-Identifier: GPL-3.0-or-later (define-module (rosenthal packages web) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages xdisorg) - #:use-module (gnu packages web) - #:use-module (guix build-system gnu) - #:use-module (guix gexp) + #:use-module (guix packages) #:use-module (guix git-download) - #:use-module (guix packages)) + #:use-module (gnu packages web)) (define-public buku-run-dev (let ((revision "23") diff --git a/rosenthal/packages/xdisorg.scm b/rosenthal/packages/xdisorg.scm index 80b3980..cccd5c3 100644 --- a/rosenthal/packages/xdisorg.scm +++ b/rosenthal/packages/xdisorg.scm @@ -3,12 +3,9 @@ ;; SPDX-License-Identifier: GPL-3.0-or-later (define-module (rosenthal packages xdisorg) - #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix gexp) - #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils) #:use-module (gnu packages xdisorg)) (define-public libdrm-2.4.115 diff --git a/rosenthal/services/networking.scm b/rosenthal/services/networking.scm index e34415b..6acd0d5 100644 --- a/rosenthal/services/networking.scm +++ b/rosenthal/services/networking.scm @@ -11,7 +11,6 @@ #:use-module (gnu packages networking) #:use-module (gnu services) #:use-module (gnu services dbus) - #:use-module (gnu services base) #:use-module (gnu services shepherd) #:use-module (gnu services configuration) #:use-module (rosenthal utils home-services-utils)