summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-10-13 11:16:32 +0200
committerlassulus <lassulus@lassul.us>2017-10-13 11:16:32 +0200
commitd37963c78b30fcf321cef8f5f69a093c55845a6d (patch)
tree3fd194129bdfe23649c6a655a1ad6e2e7517e747
parent75d9115b4b978185e7b164c2a95b7c6b5ec8012a (diff)
parent2b3ac19c26abae889bd1d63700462f418285a510 (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--makefu/2configs/binary-cache/lass.nix1
-rw-r--r--makefu/3modules/default.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/makefu/2configs/binary-cache/lass.nix b/makefu/2configs/binary-cache/lass.nix
index 4813eeb0f..46b386e14 100644
--- a/makefu/2configs/binary-cache/lass.nix
+++ b/makefu/2configs/binary-cache/lass.nix
@@ -7,6 +7,7 @@
];
binaryCachePublicKeys = [
"cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
+ "cache.prism-2:YwmCm3/s/D+SxrPKN/ETjlpw/219pNUbpnluatp6FKI="
];
};
}
diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix
index 00df56bee..af0e81df5 100644
--- a/makefu/3modules/default.nix
+++ b/makefu/3modules/default.nix
@@ -15,6 +15,7 @@ _:
./torrent.nix
./udpt.nix
./umts.nix
+ ./wvdial.nix
];
}