summary refs log tree commit diff stats
path: root/satoshipad.nix
diff options
context:
space:
mode:
authorAlan Pearce2017-09-13 15:57:39 +0200
committerAlan Pearce2017-09-13 15:57:39 +0200
commit3cd6ae385ed8ac2efd7b63ab6bd698ea8efc0c67 (patch)
treeef0532759f60efbfdb71bfe30ba5f8273b54b021 /satoshipad.nix
parent7db05c60364d3d6be69b243e0c43272b36e6ffa0 (diff)
parent38fce4627d3c2f8ba79049f571fd16bc5037d008 (diff)
downloadnixfiles-3cd6ae385ed8ac2efd7b63ab6bd698ea8efc0c67.tar.lz
nixfiles-3cd6ae385ed8ac2efd7b63ab6bd698ea8efc0c67.tar.zst
nixfiles-3cd6ae385ed8ac2efd7b63ab6bd698ea8efc0c67.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'satoshipad.nix')
-rw-r--r--satoshipad.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/satoshipad.nix b/satoshipad.nix
index 6be962c2..766f78c0 100644
--- a/satoshipad.nix
+++ b/satoshipad.nix
@@ -25,8 +25,10 @@
     ./modules/user.nix
     ./modules/user-interface.nix
     ./modules/dev.nix
+    ./modules/lisp.nix
     ./modules/javascript.nix
     ./modules/satoshipay.nix
+    ./modules/infrastructure.nix
     ./modules/accounting.nix
     ./modules/passwords.nix
     ./modules/network-manager.nix