From 87f61b04bf398e1b551f4a9b07d2303ec3980b78 Mon Sep 17 00:00:00 2001 From: Amin Bandali <mab@gnu.org> Date: Tue, 9 Oct 2018 22:38:52 -0400 Subject: [PATCH 1/1] [emacs] disable borg-nix-shell for now TODO: remove notmuch after migrating to Gnus --- .gitmodules | 9 +++------ init.org | 4 ++-- lib/borg-nix-shell | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 160000 lib/borg-nix-shell diff --git a/.gitmodules b/.gitmodules index 6dbc68b..247c556 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,9 +16,6 @@ [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 @@ -173,9 +170,9 @@ 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"] diff --git a/init.org b/init.org index 5ded313..68877ef 100644 --- 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-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 diff --git a/lib/borg-nix-shell b/lib/borg-nix-shell deleted file mode 160000 index 84dac9e..0000000 --- a/lib/borg-nix-shell +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 84dac9e821ea445a6b4542d021d3094b0c1e55d3 -- 2.20.1