diff --git a/.guix-channel b/.guix-channel index 73787dc8..2d4a2fbc 100644 --- a/.guix-channel +++ b/.guix-channel @@ -2,5 +2,6 @@ (channel (version 0) + (directory "guix") (news-file "news.txt") (url "https://gitlab.com/nonguix/nonguix")) ; the primary URL diff --git a/nongnu/ci.scm b/guix/nongnu/ci.scm similarity index 100% rename from nongnu/ci.scm rename to guix/nongnu/ci.scm diff --git a/nongnu/packages/anydesk.scm b/guix/nongnu/packages/anydesk.scm similarity index 100% rename from nongnu/packages/anydesk.scm rename to guix/nongnu/packages/anydesk.scm diff --git a/nongnu/packages/clojure.scm b/guix/nongnu/packages/clojure.scm similarity index 100% rename from nongnu/packages/clojure.scm rename to guix/nongnu/packages/clojure.scm diff --git a/nongnu/packages/compression.scm b/guix/nongnu/packages/compression.scm similarity index 100% rename from nongnu/packages/compression.scm rename to guix/nongnu/packages/compression.scm diff --git a/nongnu/packages/coq.scm b/guix/nongnu/packages/coq.scm similarity index 100% rename from nongnu/packages/coq.scm rename to guix/nongnu/packages/coq.scm diff --git a/nongnu/packages/dotnet.scm b/guix/nongnu/packages/dotnet.scm similarity index 100% rename from nongnu/packages/dotnet.scm rename to guix/nongnu/packages/dotnet.scm diff --git a/nongnu/packages/emacs.scm b/guix/nongnu/packages/emacs.scm similarity index 100% rename from nongnu/packages/emacs.scm rename to guix/nongnu/packages/emacs.scm diff --git a/nongnu/packages/emulators.scm b/guix/nongnu/packages/emulators.scm similarity index 100% rename from nongnu/packages/emulators.scm rename to guix/nongnu/packages/emulators.scm diff --git a/nongnu/packages/fonts.scm b/guix/nongnu/packages/fonts.scm similarity index 100% rename from nongnu/packages/fonts.scm rename to guix/nongnu/packages/fonts.scm diff --git a/nongnu/packages/game-development.scm b/guix/nongnu/packages/game-development.scm similarity index 100% rename from nongnu/packages/game-development.scm rename to guix/nongnu/packages/game-development.scm diff --git a/nongnu/packages/gog.scm b/guix/nongnu/packages/gog.scm similarity index 100% rename from nongnu/packages/gog.scm rename to guix/nongnu/packages/gog.scm diff --git a/nongnu/packages/linux.scm b/guix/nongnu/packages/linux.scm similarity index 100% rename from nongnu/packages/linux.scm rename to guix/nongnu/packages/linux.scm diff --git a/nongnu/packages/mozilla.scm b/guix/nongnu/packages/mozilla.scm similarity index 100% rename from nongnu/packages/mozilla.scm rename to guix/nongnu/packages/mozilla.scm diff --git a/nongnu/packages/nvidia.scm b/guix/nongnu/packages/nvidia.scm similarity index 100% rename from nongnu/packages/nvidia.scm rename to guix/nongnu/packages/nvidia.scm diff --git a/nongnu/packages/patches/broadcom-sta-debian-fix-kernel-warnings.patch b/guix/nongnu/packages/patches/broadcom-sta-debian-fix-kernel-warnings.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-debian-fix-kernel-warnings.patch rename to guix/nongnu/packages/patches/broadcom-sta-debian-fix-kernel-warnings.patch diff --git a/nongnu/packages/patches/broadcom-sta-fix_mac_profile_discrepancy.patch b/guix/nongnu/packages/patches/broadcom-sta-fix_mac_profile_discrepancy.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-fix_mac_profile_discrepancy.patch rename to guix/nongnu/packages/patches/broadcom-sta-fix_mac_profile_discrepancy.patch diff --git a/nongnu/packages/patches/broadcom-sta-gcc.patch b/guix/nongnu/packages/patches/broadcom-sta-gcc.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-gcc.patch rename to guix/nongnu/packages/patches/broadcom-sta-gcc.patch diff --git a/nongnu/packages/patches/broadcom-sta-license.patch b/guix/nongnu/packages/patches/broadcom-sta-license.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-license.patch rename to guix/nongnu/packages/patches/broadcom-sta-license.patch diff --git a/nongnu/packages/patches/broadcom-sta-linux-4.11.patch b/guix/nongnu/packages/patches/broadcom-sta-linux-4.11.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-linux-4.11.patch rename to guix/nongnu/packages/patches/broadcom-sta-linux-4.11.patch diff --git a/nongnu/packages/patches/broadcom-sta-linux-4.12.patch b/guix/nongnu/packages/patches/broadcom-sta-linux-4.12.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-linux-4.12.patch rename to guix/nongnu/packages/patches/broadcom-sta-linux-4.12.patch diff --git a/nongnu/packages/patches/broadcom-sta-linux-4.15.patch b/guix/nongnu/packages/patches/broadcom-sta-linux-4.15.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-linux-4.15.patch rename to guix/nongnu/packages/patches/broadcom-sta-linux-4.15.patch diff --git a/nongnu/packages/patches/broadcom-sta-linux-4.7.patch b/guix/nongnu/packages/patches/broadcom-sta-linux-4.7.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-linux-4.7.patch rename to guix/nongnu/packages/patches/broadcom-sta-linux-4.7.patch diff --git a/nongnu/packages/patches/broadcom-sta-linux-4.8.patch b/guix/nongnu/packages/patches/broadcom-sta-linux-4.8.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-linux-4.8.patch rename to guix/nongnu/packages/patches/broadcom-sta-linux-4.8.patch diff --git a/nongnu/packages/patches/broadcom-sta-linux-5.1.patch b/guix/nongnu/packages/patches/broadcom-sta-linux-5.1.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-linux-5.1.patch rename to guix/nongnu/packages/patches/broadcom-sta-linux-5.1.patch diff --git a/nongnu/packages/patches/broadcom-sta-linux-5.10.patch b/guix/nongnu/packages/patches/broadcom-sta-linux-5.10.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-linux-5.10.patch rename to guix/nongnu/packages/patches/broadcom-sta-linux-5.10.patch diff --git a/nongnu/packages/patches/broadcom-sta-linux-5.6.patch b/guix/nongnu/packages/patches/broadcom-sta-linux-5.6.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-linux-5.6.patch rename to guix/nongnu/packages/patches/broadcom-sta-linux-5.6.patch diff --git a/nongnu/packages/patches/broadcom-sta-linux-5.9.patch b/guix/nongnu/packages/patches/broadcom-sta-linux-5.9.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-linux-5.9.patch rename to guix/nongnu/packages/patches/broadcom-sta-linux-5.9.patch diff --git a/nongnu/packages/patches/broadcom-sta-null-pointer-fix.patch b/guix/nongnu/packages/patches/broadcom-sta-null-pointer-fix.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-null-pointer-fix.patch rename to guix/nongnu/packages/patches/broadcom-sta-null-pointer-fix.patch diff --git a/nongnu/packages/patches/broadcom-sta-rdtscl.patch b/guix/nongnu/packages/patches/broadcom-sta-rdtscl.patch similarity index 100% rename from nongnu/packages/patches/broadcom-sta-rdtscl.patch rename to guix/nongnu/packages/patches/broadcom-sta-rdtscl.patch diff --git a/nongnu/packages/playonlinux.scm b/guix/nongnu/packages/playonlinux.scm similarity index 100% rename from nongnu/packages/playonlinux.scm rename to guix/nongnu/packages/playonlinux.scm diff --git a/nongnu/packages/scanner.scm b/guix/nongnu/packages/scanner.scm similarity index 100% rename from nongnu/packages/scanner.scm rename to guix/nongnu/packages/scanner.scm diff --git a/nongnu/packages/steam-client.scm b/guix/nongnu/packages/steam-client.scm similarity index 100% rename from nongnu/packages/steam-client.scm rename to guix/nongnu/packages/steam-client.scm diff --git a/nongnu/packages/vpn.scm b/guix/nongnu/packages/vpn.scm similarity index 100% rename from nongnu/packages/vpn.scm rename to guix/nongnu/packages/vpn.scm diff --git a/nongnu/packages/wine.scm b/guix/nongnu/packages/wine.scm similarity index 100% rename from nongnu/packages/wine.scm rename to guix/nongnu/packages/wine.scm diff --git a/nongnu/services/vpn.scm b/guix/nongnu/services/vpn.scm similarity index 100% rename from nongnu/services/vpn.scm rename to guix/nongnu/services/vpn.scm diff --git a/nongnu/system/install.scm b/guix/nongnu/system/install.scm similarity index 100% rename from nongnu/system/install.scm rename to guix/nongnu/system/install.scm diff --git a/nongnu/system/linux-initrd.scm b/guix/nongnu/system/linux-initrd.scm similarity index 100% rename from nongnu/system/linux-initrd.scm rename to guix/nongnu/system/linux-initrd.scm diff --git a/nonguix/build-system/binary.scm b/guix/nonguix/build-system/binary.scm similarity index 100% rename from nonguix/build-system/binary.scm rename to guix/nonguix/build-system/binary.scm diff --git a/nonguix/build/binary-build-system.scm b/guix/nonguix/build/binary-build-system.scm similarity index 100% rename from nonguix/build/binary-build-system.scm rename to guix/nonguix/build/binary-build-system.scm diff --git a/nonguix/build/utils.scm b/guix/nonguix/build/utils.scm similarity index 100% rename from nonguix/build/utils.scm rename to guix/nonguix/build/utils.scm diff --git a/nonguix/download.scm b/guix/nonguix/download.scm similarity index 100% rename from nonguix/download.scm rename to guix/nonguix/download.scm diff --git a/nonguix/licenses.scm b/guix/nonguix/licenses.scm similarity index 100% rename from nonguix/licenses.scm rename to guix/nonguix/licenses.scm diff --git a/nonguix/modules.scm b/guix/nonguix/modules.scm similarity index 100% rename from nonguix/modules.scm rename to guix/nonguix/modules.scm diff --git a/nonguix/utils.scm b/guix/nonguix/utils.scm similarity index 100% rename from nonguix/utils.scm rename to guix/nonguix/utils.scm