Delete nyxt/submodules

INSTALL

@@ -12,11 +12,10 @@ it is set to $PREFIX/share/.
 
 NASDF_TESTS_NO_NETWORK disables tests that require networking.
 
-When NYXT_SUBMODULES is "true" (the default), all Lisp dependencies are fetched
-as git submodules to the directory set by NASDF_SUBMODULES_DIR.  Otherwise, they
-need to be made visible to ASDF by other means.  In case you have received an
-archive that includes the source of these Lisp dependencies, then it all should
-work out of the box.
+When NYXT_SUBMODULES is "true" (the default), all Lisp dependencies are searched
+at ./_build.  Otherwise, they need to be made visible to ASDF by other means.
+In case you have received an archive that includes the source of these Lisp
+dependencies, then it all should work out of the box.
 
 NYXT_RENDERER sets the renderer, by default "gi-gtk".
 

build-scripts/shell-electron.nix

@@ -26,5 +26,10 @@ stdenv.mkDerivation {
                                                    pkgs.sqlite.out
                                                    pkgs.libressl.out ]};";
 
+  shellHook =
+    ''
+    NYXT_ROOT=`dirname ${toString ../README.org}`;
+    export CL_SOURCE_REGISTRY=$HOME/common-lisp//:$NYXT_ROOT/_build//:$CL_SOURCE_REGISTRY;
+    '';
 
 }

build-scripts/shell-gi-gtk.nix

@@ -58,4 +58,11 @@ stdenv.mkDerivation {
 
   GIO_MODULE_DIR = "${pkgs.glib-networking.out}/lib/gio/modules/";
   GIO_EXTRA_MODULES = "${pkgs.glib-networking.out}/lib/gio/modules/";
+
+  shellHook =
+    ''
+    NYXT_ROOT=`dirname ${toString ../README.org}`;
+    export CL_SOURCE_REGISTRY=$HOME/common-lisp//:$NYXT_ROOT/_build//:$CL_SOURCE_REGISTRY;
+    '';
+
 }

libraries/nasdf/nasdf.asd

@@ -1,8 +1,6 @@
 ;;;; SPDX-FileCopyrightText: Atlas Engineer LLC
 ;;;; SPDX-License-Identifier: BSD-3-Clause
 
-;; Can't depend on CL libraries, because it's in charge of fetching them as git
-;; submodules.
 (defsystem "nasdf"
   :version "0.1.8"
   :author "Atlas Engineer LLC"
@@ -12,6 +10,5 @@
                (:file "log")
                (:file "nasdf")
                (:file "install")
-               (:file "submodules")
                (:file "systems")
                (:file "tests")))

libraries/nasdf/package.lisp

@@ -34,22 +34,7 @@ A test system:
   :class :nasdf-test-system
   :depends-on (alexandria lisp-unit2)
   :components ((:file \"tests\"))
-  :test-suite-args (:package :my-project/tests))
-
-A system that fetches the Git submodules:
-
-(defsystem \"my-project/submodules\"
-  :defsystem-depends-on (\"nasdf\")
-  :class :nasdf-submodule-system)
-
-Shell command to add a submodule to the default directory:
-
-    git submodule add https://github.com/atlas-engineer/history-tree _build/history-tree
-
-To update it:
-
-    git submodule update --remote _build/history-tree
-"))
+  :test-suite-args (:package :my-project/tests))"))
 
 #+sb-package-locks
 (sb-ext:lock-package :nasdf)

libraries/nasdf/readme.org

@@ -5,8 +5,6 @@ installation.
 
 * Features
 
-- Manage CL dependencies as Git submodules, ensuring fine control over their
-  versions.
 - Test suite helpers.
 - Installation helpers such as handling of icons or desktop files.
 
@@ -17,8 +15,6 @@ See [[file:package.lisp]] for more details.
 NASDF exposes the following environment variables for convenience:
 
 - =NASDF_SOURCE_PATH= :: See =nasdf:*dest-source-dir*=.
-- =NASDF_SUBMODULES_DIR= :: See =nasdf:*submodules-directory*=.
-- =NASDF_SUBMODULES_JOBS= :: See =nasdf:*submodules-jobs*=.
 - =NASDF_USE_LOGICAL_PATHS= :: Allow non-expanded logical pathnames in system
   pathnames.
   This is particularly useful when shipping the source.

makefile

@@ -27,9 +27,13 @@ help:
 
 makefile_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
+ifeq ($(NYXT_SUBMODULES),true)
+	CL_SOURCE_REGISTRY = $(makefile_dir)_build//
+	export CL_SOURCE_REGISTRY
+endif
+
 lisp_eval:=$(LISP) $(LISP_FLAGS) \
 	--eval '(require "asdf")' \
-	--eval '(when (string= "$(NYXT_SUBMODULES)" "true") (setf asdf:*default-source-registries* (list (quote asdf/source-registry:environment-source-registry))) (asdf:clear-configuration) (asdf:load-asd "$(makefile_dir)/libraries/nasdf/nasdf.asd") (asdf:load-asd "$(makefile_dir)/nyxt.asd") (asdf:load-system :nyxt/submodules))' \
 	--eval '(asdf:load-asd "$(makefile_dir)/libraries/nasdf/nasdf.asd")' \
 	--eval '(asdf:load-asd "$(makefile_dir)/nyxt.asd")' \
 	--eval

nyxt.asd

@@ -227,10 +227,6 @@
                          (test-op "nyxt/analysis")
                          (test-op "nyxt/theme"))))
 
-(defsystem "nyxt/submodules"
-  :defsystem-depends-on ("nasdf")
-  :class :nasdf-submodule-system)
-
 (defsystem "nyxt/tests"
   :defsystem-depends-on ("nasdf")
   :class :nasdf-test-system