[emacs] add borg-nix-shell and use it to build notmuch's build deps

[~bandali/configs] / .gitmodules

diff --git a/.gitmodules b/.gitmodules
index 9d52507..e5a4bb5 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,12 +16,18 @@
 [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 "closql"]
        path = lib/closql
        url = git@github.com:emacscollective/closql.git
 [submodule "company"]
        path = lib/company
        url = git@github.com:company-mode/company-mode.git
 [submodule "closql"]
        path = lib/closql
        url = git@github.com:emacscollective/closql.git
 [submodule "company"]
        path = lib/company
        url = git@github.com:company-mode/company-mode.git

+[submodule "counsel-notmuch"]
+       path = lib/counsel-notmuch
+       url = git@github.com:fuxialexander/counsel-notmuch.git

 [submodule "crux"]
        path = lib/crux
        url = git@github.com:bbatsov/crux.git
 [submodule "crux"]
        path = lib/crux
        url = git@github.com:bbatsov/crux.git


@@ -96,9 +102,6 @@
        path = lib/ivy
        url = git@github.com:abo-abo/swiper.git
        info-path = doc
        path = lib/ivy
        url = git@github.com:abo-abo/swiper.git
        info-path = doc

-[submodule "key-chord"]
-       path = lib/key-chord
-       url = git@github.com:emacsorphanage/key-chord.git

 [submodule "lcr"]
        path = lib/lcr
        url = git@github.com:jyp/lcr.git
 [submodule "lcr"]
        path = lib/lcr
        url = git@github.com:jyp/lcr.git


@@ -130,6 +133,7 @@
        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
        build-step = make
        build-step = make sphinx-texinfo
        build-step = ./configure
        build-step = make
        build-step = make sphinx-texinfo


@@ -162,9 +166,6 @@
 [submodule "proof-site"]  # Proof General
        path = lib/proof-site
        url = git@github.com:ProofGeneral/PG.git
 [submodule "proof-site"]  # Proof General
        path = lib/proof-site
        url = git@github.com:ProofGeneral/PG.git

-[submodule "ryo-modal"]
-       path = lib/ryo-modal
-       url = git@github.com:Kungsgeten/ryo-modal.git

 [submodule "s"]
        path = lib/s
        url = git@github.com:magnars/s.el.git
 [submodule "s"]
        path = lib/s
        url = git@github.com:magnars/s.el.git