Merge remote-tracking branch 'prism/master'

This commit is contained in:
tv 2017-02-09 14:54:56 +01:00
commit 708ae2b5f1

View file

@ -143,7 +143,6 @@ with import <stockholm/lib>;
nixpkgs.config.packageOverrides = pkgs: {
nano = pkgs.runCommand "empty" {} "mkdir -p $out";
tinc = pkgs.tinc_pre;
gnupg1compat = super.gnupg1compat.override { gnupg = self.gnupg21; };
};
services.cron.enable = false;