[emacs] disable borg-nix-shell for now
authorAmin Bandali <mab@gnu.org>
Wed, 10 Oct 2018 02:38:52 +0000 (22:38 -0400)
committerAmin Bandali <mab@gnu.org>
Wed, 10 Oct 2018 02:38:52 +0000 (22:38 -0400)
TODO: remove notmuch after migrating to Gnus

.gitmodules
init.org
lib/borg-nix-shell [deleted submodule]

index 6dbc68b..247c556 100644 (file)
@@ -16,9 +16,6 @@
 [submodule "borg"]
        path = lib/borg
        url = git@github.com:emacscollective/borg.git
 [submodule "borg"]
        path = lib/borg
        url = git@github.com:emacscollective/borg.git
-[submodule "borg-nix-shell"]
-       path = lib/borg-nix-shell
-       url = git@github.com:thblt/borg-nix-shell.git
 [submodule "boxquote"]
        path = lib/boxquote
        url = git@github.com:davep/boxquote.el.git
 [submodule "boxquote"]
        path = lib/boxquote
        url = git@github.com:davep/boxquote.el.git
        url = https://git.notmuchmail.org/git/notmuch
        load-path = emacs
        info-path = doc/_build/texinfo
        url = https://git.notmuchmail.org/git/notmuch
        load-path = emacs
        info-path = doc/_build/texinfo
-       build-nix-shell-packages = pkgconfig gitMinimal xapian gmime talloc zlib pythonPackages.sphinx pythonPackages.python texinfo
-       build-step = ./configure --without-docs
-       build-step = make
+       build-nix-shell-packages = pkgconfig gitMinimal xapian gmime talloc zlib pythonPackages.sphinx pythonPackages.python texinfo
+       build-step = ./configure --without-docs
+       build-step = make
        # build-step = make sphinx-texinfo
        # build-step = borg-makeinfo
 [submodule "org"]
        # build-step = make sphinx-texinfo
        # build-step = borg-makeinfo
 [submodule "org"]
index 5ded313..68877ef 100644 (file)
--- a/init.org
+++ b/init.org
@@ -234,8 +234,8 @@ can then be managed with the help of Magit or other tools.
 (require 'borg)
 (borg-initialize)
 
 (require 'borg)
 (borg-initialize)
 
-(require 'borg-nix-shell)
-(setq borg-build-shell-command 'borg-nix-shell-build-command)
+;; (require 'borg-nix-shell)
+;; (setq borg-build-shell-command 'borg-nix-shell-build-command)
 
 (with-eval-after-load 'bind-key
   (bind-keys
 
 (with-eval-after-load 'bind-key
   (bind-keys
diff --git a/lib/borg-nix-shell b/lib/borg-nix-shell
deleted file mode 160000 (submodule)
index 84dac9e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 84dac9e821ea445a6b4542d021d3094b0c1e55d3