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 | 708ae2b5f144bd3b73682fc3b109e2862c8251aa (patch) | |
| tree | 1533460182d9fe77504434dc696fcc0b86c77bdd /2configs | |
| parent | 2ac1fc4f84e52f84b5e136797a98d3721800af03 (diff) | |
| parent | 7ac4b20eaeb046d13c64399d7f9224279b9e69cb (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to '2configs')
| -rw-r--r-- | 2configs/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/2configs/default.nix b/2configs/default.nix index 488ca17d4..45f7315b0 100644 --- a/2configs/default.nix +++ b/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; |