diff options
| author | lassulus <lassulus@lassul.us> | 2018-01-10 15:30:45 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-01-10 15:30:45 +0100 |
| commit | 42e1d088367412b3f2a340a242285c5734508735 (patch) | |
| tree | 98b39d306d6ba825f03540a3f406374b4a5d769b /krebs | |
| parent | 794e4fe21b9d0841f80ecab184716fbf88328aed (diff) | |
| parent | cc51c5f7db21749b87b0db096087b7e7447a8f0a (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/internetarchive/default.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 9f1842b88..56e5c6b82 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -541,6 +541,7 @@ with import <stockholm/lib>; graph IN A ${nets.internet.ip4.addr} ghook IN A ${nets.internet.ip4.addr} dockerhub IN A ${nets.internet.ip4.addr} + photostore IN A ${nets.internet.ip4.addr} io IN NS gum.krebsco.de. ''; }; diff --git a/krebs/5pkgs/simple/internetarchive/default.nix b/krebs/5pkgs/simple/internetarchive/default.nix index 2f55e6f42..3c83093be 100644 --- a/krebs/5pkgs/simple/internetarchive/default.nix +++ b/krebs/5pkgs/simple/internetarchive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchPypi, ... }: +{ stdenv, pkgs, ... }: with pkgs.python3Packages; buildPythonPackage rec { pname = "internetarchive"; |