diff options
author | lassulus <lassulus@lassul.us> | 2017-07-17 08:02:01 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-07-17 08:02:01 +0200 |
commit | ae5fef979de5f0c5c8c1e78f56ddc1f8b4caf5b2 (patch) | |
tree | 2aea66950046fd3a6bce059e19ce0536a3e8331f /makefu/1systems/x | |
parent | 2d6447d9669ba74780a57dd4ddcdb19110bd4928 (diff) | |
parent | a3f6c2e49d37eb8d629cac1e8365d5b90a2ccd3c (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x')
-rw-r--r-- | makefu/1systems/x/config.nix | 1 | ||||
-rw-r--r-- | makefu/1systems/x/source.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 2dd232193..80c09df1c 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -19,6 +19,7 @@ with import <stockholm/lib>; # <stockholm/makefu/2configs/disable_v6.nix> # Testing + # <stockholm/makefu/2configs/torrent.nix> # <stockholm/makefu/2configs/lanparty/lancache.nix> # <stockholm/makefu/2configs/lanparty/lancache-dns.nix> # <stockholm/makefu/2configs/deployment/dirctator.nix> diff --git a/makefu/1systems/x/source.nix b/makefu/1systems/x/source.nix index 54ec3c8a9..6dc17b656 100644 --- a/makefu/1systems/x/source.nix +++ b/makefu/1systems/x/source.nix @@ -1,4 +1,5 @@ import <stockholm/makefu/source.nix> { name="x"; full = true; + # torrent = true; } |