diff options
| author | makefu <github@syntax-fehler.de> | 2017-02-09 16:45:29 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-02-09 16:45:29 +0100 |
| commit | 8cefb4663624bcc4fbf0379b2cc02f2e84f0320b (patch) | |
| tree | 6bc760e37c02ea2c54c9702c0251e502b18ada75 /makefu | |
| parent | 4f34c772c2dd4e48a303d3ea3349ec11cd747498 (diff) | |
| parent | e78a8c0725cbcf3179d63f8f94ca77e7ccb345d8 (diff) | |
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/2configs/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 488ca17d4..45f7315b0 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -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; |