Merge remote-tracking branch 'prism/master'
This commit is contained in:
commit
708ae2b5f1
|
@ -143,7 +143,6 @@ with import <stockholm/lib>;
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
nano = pkgs.runCommand "empty" {} "mkdir -p $out";
|
nano = pkgs.runCommand "empty" {} "mkdir -p $out";
|
||||||
tinc = pkgs.tinc_pre;
|
tinc = pkgs.tinc_pre;
|
||||||
gnupg1compat = super.gnupg1compat.override { gnupg = self.gnupg21; };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.cron.enable = false;
|
services.cron.enable = false;
|
||||||
|
|
Loading…
Reference in a new issue