diff options
| author | tv <tv@krebsco.de> | 2017-02-09 14:54:56 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-02-09 14:54:56 +0100 |
| commit | 38d2ff961f2ad8d02ae6061952abe42e4de89f75 (patch) | |
| tree | a8573db9389ba5268a8fb83ddef6d92e3e1a7815 /makefu/2configs | |
| parent | ed406bd979609fd05f5846049f571f43e6512050 (diff) | |
| parent | 954477b8674156754cd51021d92885b456a04a5b (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs')
| -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; |