From 89b524ab580787ca02531846e62c19fefe7d12e7 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 19 Jun 2024 23:51:13 +0200 Subject: [PATCH] Move Guile modules under modules/ . This patch moves Guile modules shipped as a Guix channel under the modules directory. The rationale behind this is that we are probably adding unwanted files into Guile's load path, such as the news file and possible scripts that could be added to the channel repository in the future. * guix-channel (channel): Set directory field. * nongnu/*: Move under modules/nongnu. * nonguix/*: Move under modules/nonguix. --- .guix-channel | 1 + {guix => modules/guix}/import/nvidia.scm | 0 {nongnu => modules/nongnu}/ci.scm | 0 {nongnu => modules/nongnu}/packages/anydesk.scm | 0 {nongnu => modules/nongnu}/packages/benchmark.scm | 0 {nongnu => modules/nongnu}/packages/cad.scm | 0 {nongnu => modules/nongnu}/packages/chrome.scm | 0 {nongnu => modules/nongnu}/packages/chromium.scm | 0 {nongnu => modules/nongnu}/packages/clojure.scm | 0 {nongnu => modules/nongnu}/packages/compression.scm | 0 {nongnu => modules/nongnu}/packages/coq.scm | 0 {nongnu => modules/nongnu}/packages/databases.scm | 0 {nongnu => modules/nongnu}/packages/dotnet.scm | 0 {nongnu => modules/nongnu}/packages/dyalog.scm | 0 {nongnu => modules/nongnu}/packages/editors.scm | 0 {nongnu => modules/nongnu}/packages/electron.scm | 0 {nongnu => modules/nongnu}/packages/emacs.scm | 0 {nongnu => modules/nongnu}/packages/emulators.scm | 0 {nongnu => modules/nongnu}/packages/engineering.scm | 0 {nongnu => modules/nongnu}/packages/firmware.scm | 0 {nongnu => modules/nongnu}/packages/fonts.scm | 0 {nongnu => modules/nongnu}/packages/game-client.scm | 0 {nongnu => modules/nongnu}/packages/game-development.scm | 0 {nongnu => modules/nongnu}/packages/gog.scm | 0 {nongnu => modules/nongnu}/packages/k8s.scm | 0 {nongnu => modules/nongnu}/packages/linux.scm | 0 {nongnu => modules/nongnu}/packages/lisp.scm | 0 {nongnu => modules/nongnu}/packages/messaging.scm | 0 {nongnu => modules/nongnu}/packages/mozilla.scm | 0 {nongnu => modules/nongnu}/packages/music.scm | 0 {nongnu => modules/nongnu}/packages/ncurses.scm | 0 {nongnu => modules/nongnu}/packages/nvidia.scm | 0 .../nongnu}/packages/patches/firefox-esr-compare-paths.patch | 0 .../packages/patches/firefox-esr-use-system-wide-dir.patch | 0 .../nongnu}/packages/patches/firefox-restore-desktop-files.patch | 0 .../nongnu}/packages/patches/firefox-use-system-wide-dir.patch | 0 {nongnu => modules/nongnu}/packages/playonlinux.scm | 0 {nongnu => modules/nongnu}/packages/printers.scm | 0 {nongnu => modules/nongnu}/packages/productivity.scm | 0 {nongnu => modules/nongnu}/packages/radio.scm | 0 {nongnu => modules/nongnu}/packages/scanner.scm | 0 {nongnu => modules/nongnu}/packages/version-control.scm | 0 {nongnu => modules/nongnu}/packages/video.scm | 0 {nongnu => modules/nongnu}/packages/vpn.scm | 0 {nongnu => modules/nongnu}/packages/wasm.scm | 0 {nongnu => modules/nongnu}/packages/wine.scm | 0 {nongnu => modules/nongnu}/services/nvidia.scm | 0 {nongnu => modules/nongnu}/services/vpn.scm | 0 {nongnu => modules/nongnu}/system/install.scm | 0 {nongnu => modules/nongnu}/system/linux-initrd.scm | 0 {nonguix => modules/nonguix}/build-system/binary.scm | 0 {nonguix => modules/nonguix}/build-system/chromium-binary.scm | 0 {nonguix => modules/nonguix}/build/binary-build-system.scm | 0 .../nonguix}/build/chromium-binary-build-system.scm | 0 {nonguix => modules/nonguix}/build/utils.scm | 0 {nonguix => modules/nonguix}/download.scm | 0 {nonguix => modules/nonguix}/licenses.scm | 0 {nonguix => modules/nonguix}/modules.scm | 0 {nonguix => modules/nonguix}/multiarch-container.scm | 0 {nonguix => modules/nonguix}/utils.scm | 0 60 files changed, 1 insertion(+) rename {guix => modules/guix}/import/nvidia.scm (100%) rename {nongnu => modules/nongnu}/ci.scm (100%) rename {nongnu => modules/nongnu}/packages/anydesk.scm (100%) rename {nongnu => modules/nongnu}/packages/benchmark.scm (100%) rename {nongnu => modules/nongnu}/packages/cad.scm (100%) rename {nongnu => modules/nongnu}/packages/chrome.scm (100%) rename {nongnu => modules/nongnu}/packages/chromium.scm (100%) rename {nongnu => modules/nongnu}/packages/clojure.scm (100%) rename {nongnu => modules/nongnu}/packages/compression.scm (100%) rename {nongnu => modules/nongnu}/packages/coq.scm (100%) rename {nongnu => modules/nongnu}/packages/databases.scm (100%) rename {nongnu => modules/nongnu}/packages/dotnet.scm (100%) rename {nongnu => modules/nongnu}/packages/dyalog.scm (100%) rename {nongnu => modules/nongnu}/packages/editors.scm (100%) rename {nongnu => modules/nongnu}/packages/electron.scm (100%) rename {nongnu => modules/nongnu}/packages/emacs.scm (100%) rename {nongnu => modules/nongnu}/packages/emulators.scm (100%) rename {nongnu => modules/nongnu}/packages/engineering.scm (100%) rename {nongnu => modules/nongnu}/packages/firmware.scm (100%) rename {nongnu => modules/nongnu}/packages/fonts.scm (100%) rename {nongnu => modules/nongnu}/packages/game-client.scm (100%) rename {nongnu => modules/nongnu}/packages/game-development.scm (100%) rename {nongnu => modules/nongnu}/packages/gog.scm (100%) rename {nongnu => modules/nongnu}/packages/k8s.scm (100%) rename {nongnu => modules/nongnu}/packages/linux.scm (100%) rename {nongnu => modules/nongnu}/packages/lisp.scm (100%) rename {nongnu => modules/nongnu}/packages/messaging.scm (100%) rename {nongnu => modules/nongnu}/packages/mozilla.scm (100%) rename {nongnu => modules/nongnu}/packages/music.scm (100%) rename {nongnu => modules/nongnu}/packages/ncurses.scm (100%) rename {nongnu => modules/nongnu}/packages/nvidia.scm (100%) rename {nongnu => modules/nongnu}/packages/patches/firefox-esr-compare-paths.patch (100%) rename {nongnu => modules/nongnu}/packages/patches/firefox-esr-use-system-wide-dir.patch (100%) rename {nongnu => modules/nongnu}/packages/patches/firefox-restore-desktop-files.patch (100%) rename {nongnu => modules/nongnu}/packages/patches/firefox-use-system-wide-dir.patch (100%) rename {nongnu => modules/nongnu}/packages/playonlinux.scm (100%) rename {nongnu => modules/nongnu}/packages/printers.scm (100%) rename {nongnu => modules/nongnu}/packages/productivity.scm (100%) rename {nongnu => modules/nongnu}/packages/radio.scm (100%) rename {nongnu => modules/nongnu}/packages/scanner.scm (100%) rename {nongnu => modules/nongnu}/packages/version-control.scm (100%) rename {nongnu => modules/nongnu}/packages/video.scm (100%) rename {nongnu => modules/nongnu}/packages/vpn.scm (100%) rename {nongnu => modules/nongnu}/packages/wasm.scm (100%) rename {nongnu => modules/nongnu}/packages/wine.scm (100%) rename {nongnu => modules/nongnu}/services/nvidia.scm (100%) rename {nongnu => modules/nongnu}/services/vpn.scm (100%) rename {nongnu => modules/nongnu}/system/install.scm (100%) rename {nongnu => modules/nongnu}/system/linux-initrd.scm (100%) rename {nonguix => modules/nonguix}/build-system/binary.scm (100%) rename {nonguix => modules/nonguix}/build-system/chromium-binary.scm (100%) rename {nonguix => modules/nonguix}/build/binary-build-system.scm (100%) rename {nonguix => modules/nonguix}/build/chromium-binary-build-system.scm (100%) rename {nonguix => modules/nonguix}/build/utils.scm (100%) rename {nonguix => modules/nonguix}/download.scm (100%) rename {nonguix => modules/nonguix}/licenses.scm (100%) rename {nonguix => modules/nonguix}/modules.scm (100%) rename {nonguix => modules/nonguix}/multiarch-container.scm (100%) rename {nonguix => modules/nonguix}/utils.scm (100%) diff --git a/.guix-channel b/.guix-channel index cfa33b0..04fe5a6 100644 --- a/.guix-channel +++ b/.guix-channel @@ -4,4 +4,5 @@ (channel (version 0) (news-file "news.txt") + (directory "modules") (url "https://gitlab.com/nonguix/nonguix")) ; the primary URL diff --git a/guix/import/nvidia.scm b/modules/guix/import/nvidia.scm similarity index 100% rename from guix/import/nvidia.scm rename to modules/guix/import/nvidia.scm diff --git a/nongnu/ci.scm b/modules/nongnu/ci.scm similarity index 100% rename from nongnu/ci.scm rename to modules/nongnu/ci.scm diff --git a/nongnu/packages/anydesk.scm b/modules/nongnu/packages/anydesk.scm similarity index 100% rename from nongnu/packages/anydesk.scm rename to modules/nongnu/packages/anydesk.scm diff --git a/nongnu/packages/benchmark.scm b/modules/nongnu/packages/benchmark.scm similarity index 100% rename from nongnu/packages/benchmark.scm rename to modules/nongnu/packages/benchmark.scm diff --git a/nongnu/packages/cad.scm b/modules/nongnu/packages/cad.scm similarity index 100% rename from nongnu/packages/cad.scm rename to modules/nongnu/packages/cad.scm diff --git a/nongnu/packages/chrome.scm b/modules/nongnu/packages/chrome.scm similarity index 100% rename from nongnu/packages/chrome.scm rename to modules/nongnu/packages/chrome.scm diff --git a/nongnu/packages/chromium.scm b/modules/nongnu/packages/chromium.scm similarity index 100% rename from nongnu/packages/chromium.scm rename to modules/nongnu/packages/chromium.scm diff --git a/nongnu/packages/clojure.scm b/modules/nongnu/packages/clojure.scm similarity index 100% rename from nongnu/packages/clojure.scm rename to modules/nongnu/packages/clojure.scm diff --git a/nongnu/packages/compression.scm b/modules/nongnu/packages/compression.scm similarity index 100% rename from nongnu/packages/compression.scm rename to modules/nongnu/packages/compression.scm diff --git a/nongnu/packages/coq.scm b/modules/nongnu/packages/coq.scm similarity index 100% rename from nongnu/packages/coq.scm rename to modules/nongnu/packages/coq.scm diff --git a/nongnu/packages/databases.scm b/modules/nongnu/packages/databases.scm similarity index 100% rename from nongnu/packages/databases.scm rename to modules/nongnu/packages/databases.scm diff --git a/nongnu/packages/dotnet.scm b/modules/nongnu/packages/dotnet.scm similarity index 100% rename from nongnu/packages/dotnet.scm rename to modules/nongnu/packages/dotnet.scm diff --git a/nongnu/packages/dyalog.scm b/modules/nongnu/packages/dyalog.scm similarity index 100% rename from nongnu/packages/dyalog.scm rename to modules/nongnu/packages/dyalog.scm diff --git a/nongnu/packages/editors.scm b/modules/nongnu/packages/editors.scm similarity index 100% rename from nongnu/packages/editors.scm rename to modules/nongnu/packages/editors.scm diff --git a/nongnu/packages/electron.scm b/modules/nongnu/packages/electron.scm similarity index 100% rename from nongnu/packages/electron.scm rename to modules/nongnu/packages/electron.scm diff --git a/nongnu/packages/emacs.scm b/modules/nongnu/packages/emacs.scm similarity index 100% rename from nongnu/packages/emacs.scm rename to modules/nongnu/packages/emacs.scm diff --git a/nongnu/packages/emulators.scm b/modules/nongnu/packages/emulators.scm similarity index 100% rename from nongnu/packages/emulators.scm rename to modules/nongnu/packages/emulators.scm diff --git a/nongnu/packages/engineering.scm b/modules/nongnu/packages/engineering.scm similarity index 100% rename from nongnu/packages/engineering.scm rename to modules/nongnu/packages/engineering.scm diff --git a/nongnu/packages/firmware.scm b/modules/nongnu/packages/firmware.scm similarity index 100% rename from nongnu/packages/firmware.scm rename to modules/nongnu/packages/firmware.scm diff --git a/nongnu/packages/fonts.scm b/modules/nongnu/packages/fonts.scm similarity index 100% rename from nongnu/packages/fonts.scm rename to modules/nongnu/packages/fonts.scm diff --git a/nongnu/packages/game-client.scm b/modules/nongnu/packages/game-client.scm similarity index 100% rename from nongnu/packages/game-client.scm rename to modules/nongnu/packages/game-client.scm diff --git a/nongnu/packages/game-development.scm b/modules/nongnu/packages/game-development.scm similarity index 100% rename from nongnu/packages/game-development.scm rename to modules/nongnu/packages/game-development.scm diff --git a/nongnu/packages/gog.scm b/modules/nongnu/packages/gog.scm similarity index 100% rename from nongnu/packages/gog.scm rename to modules/nongnu/packages/gog.scm diff --git a/nongnu/packages/k8s.scm b/modules/nongnu/packages/k8s.scm similarity index 100% rename from nongnu/packages/k8s.scm rename to modules/nongnu/packages/k8s.scm diff --git a/nongnu/packages/linux.scm b/modules/nongnu/packages/linux.scm similarity index 100% rename from nongnu/packages/linux.scm rename to modules/nongnu/packages/linux.scm diff --git a/nongnu/packages/lisp.scm b/modules/nongnu/packages/lisp.scm similarity index 100% rename from nongnu/packages/lisp.scm rename to modules/nongnu/packages/lisp.scm diff --git a/nongnu/packages/messaging.scm b/modules/nongnu/packages/messaging.scm similarity index 100% rename from nongnu/packages/messaging.scm rename to modules/nongnu/packages/messaging.scm diff --git a/nongnu/packages/mozilla.scm b/modules/nongnu/packages/mozilla.scm similarity index 100% rename from nongnu/packages/mozilla.scm rename to modules/nongnu/packages/mozilla.scm diff --git a/nongnu/packages/music.scm b/modules/nongnu/packages/music.scm similarity index 100% rename from nongnu/packages/music.scm rename to modules/nongnu/packages/music.scm diff --git a/nongnu/packages/ncurses.scm b/modules/nongnu/packages/ncurses.scm similarity index 100% rename from nongnu/packages/ncurses.scm rename to modules/nongnu/packages/ncurses.scm diff --git a/nongnu/packages/nvidia.scm b/modules/nongnu/packages/nvidia.scm similarity index 100% rename from nongnu/packages/nvidia.scm rename to modules/nongnu/packages/nvidia.scm diff --git a/nongnu/packages/patches/firefox-esr-compare-paths.patch b/modules/nongnu/packages/patches/firefox-esr-compare-paths.patch similarity index 100% rename from nongnu/packages/patches/firefox-esr-compare-paths.patch rename to modules/nongnu/packages/patches/firefox-esr-compare-paths.patch diff --git a/nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch b/modules/nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch similarity index 100% rename from nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch rename to modules/nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch diff --git a/nongnu/packages/patches/firefox-restore-desktop-files.patch b/modules/nongnu/packages/patches/firefox-restore-desktop-files.patch similarity index 100% rename from nongnu/packages/patches/firefox-restore-desktop-files.patch rename to modules/nongnu/packages/patches/firefox-restore-desktop-files.patch diff --git a/nongnu/packages/patches/firefox-use-system-wide-dir.patch b/modules/nongnu/packages/patches/firefox-use-system-wide-dir.patch similarity index 100% rename from nongnu/packages/patches/firefox-use-system-wide-dir.patch rename to modules/nongnu/packages/patches/firefox-use-system-wide-dir.patch diff --git a/nongnu/packages/playonlinux.scm b/modules/nongnu/packages/playonlinux.scm similarity index 100% rename from nongnu/packages/playonlinux.scm rename to modules/nongnu/packages/playonlinux.scm diff --git a/nongnu/packages/printers.scm b/modules/nongnu/packages/printers.scm similarity index 100% rename from nongnu/packages/printers.scm rename to modules/nongnu/packages/printers.scm diff --git a/nongnu/packages/productivity.scm b/modules/nongnu/packages/productivity.scm similarity index 100% rename from nongnu/packages/productivity.scm rename to modules/nongnu/packages/productivity.scm diff --git a/nongnu/packages/radio.scm b/modules/nongnu/packages/radio.scm similarity index 100% rename from nongnu/packages/radio.scm rename to modules/nongnu/packages/radio.scm diff --git a/nongnu/packages/scanner.scm b/modules/nongnu/packages/scanner.scm similarity index 100% rename from nongnu/packages/scanner.scm rename to modules/nongnu/packages/scanner.scm diff --git a/nongnu/packages/version-control.scm b/modules/nongnu/packages/version-control.scm similarity index 100% rename from nongnu/packages/version-control.scm rename to modules/nongnu/packages/version-control.scm diff --git a/nongnu/packages/video.scm b/modules/nongnu/packages/video.scm similarity index 100% rename from nongnu/packages/video.scm rename to modules/nongnu/packages/video.scm diff --git a/nongnu/packages/vpn.scm b/modules/nongnu/packages/vpn.scm similarity index 100% rename from nongnu/packages/vpn.scm rename to modules/nongnu/packages/vpn.scm diff --git a/nongnu/packages/wasm.scm b/modules/nongnu/packages/wasm.scm similarity index 100% rename from nongnu/packages/wasm.scm rename to modules/nongnu/packages/wasm.scm diff --git a/nongnu/packages/wine.scm b/modules/nongnu/packages/wine.scm similarity index 100% rename from nongnu/packages/wine.scm rename to modules/nongnu/packages/wine.scm diff --git a/nongnu/services/nvidia.scm b/modules/nongnu/services/nvidia.scm similarity index 100% rename from nongnu/services/nvidia.scm rename to modules/nongnu/services/nvidia.scm diff --git a/nongnu/services/vpn.scm b/modules/nongnu/services/vpn.scm similarity index 100% rename from nongnu/services/vpn.scm rename to modules/nongnu/services/vpn.scm diff --git a/nongnu/system/install.scm b/modules/nongnu/system/install.scm similarity index 100% rename from nongnu/system/install.scm rename to modules/nongnu/system/install.scm diff --git a/nongnu/system/linux-initrd.scm b/modules/nongnu/system/linux-initrd.scm similarity index 100% rename from nongnu/system/linux-initrd.scm rename to modules/nongnu/system/linux-initrd.scm diff --git a/nonguix/build-system/binary.scm b/modules/nonguix/build-system/binary.scm similarity index 100% rename from nonguix/build-system/binary.scm rename to modules/nonguix/build-system/binary.scm diff --git a/nonguix/build-system/chromium-binary.scm b/modules/nonguix/build-system/chromium-binary.scm similarity index 100% rename from nonguix/build-system/chromium-binary.scm rename to modules/nonguix/build-system/chromium-binary.scm diff --git a/nonguix/build/binary-build-system.scm b/modules/nonguix/build/binary-build-system.scm similarity index 100% rename from nonguix/build/binary-build-system.scm rename to modules/nonguix/build/binary-build-system.scm diff --git a/nonguix/build/chromium-binary-build-system.scm b/modules/nonguix/build/chromium-binary-build-system.scm similarity index 100% rename from nonguix/build/chromium-binary-build-system.scm rename to modules/nonguix/build/chromium-binary-build-system.scm diff --git a/nonguix/build/utils.scm b/modules/nonguix/build/utils.scm similarity index 100% rename from nonguix/build/utils.scm rename to modules/nonguix/build/utils.scm diff --git a/nonguix/download.scm b/modules/nonguix/download.scm similarity index 100% rename from nonguix/download.scm rename to modules/nonguix/download.scm diff --git a/nonguix/licenses.scm b/modules/nonguix/licenses.scm similarity index 100% rename from nonguix/licenses.scm rename to modules/nonguix/licenses.scm diff --git a/nonguix/modules.scm b/modules/nonguix/modules.scm similarity index 100% rename from nonguix/modules.scm rename to modules/nonguix/modules.scm diff --git a/nonguix/multiarch-container.scm b/modules/nonguix/multiarch-container.scm similarity index 100% rename from nonguix/multiarch-container.scm rename to modules/nonguix/multiarch-container.scm diff --git a/nonguix/utils.scm b/modules/nonguix/utils.scm similarity index 100% rename from nonguix/utils.scm rename to modules/nonguix/utils.scm