Merge remote-tracking branch 'upstream/master' into HEAD

2017-08-17 18:34:17 +02:00
parent 9289365627 31eea73f99
commit 8f2ea38f8f
67 changed files with 1727 additions and 731 deletions
--- a/pkgs/data/misc/dns-root-data/default.nix
+++ b/pkgs/data/misc/dns-root-data/default.nix
@@ -4,7 +4,7 @@ let

  rootHints = fetchurl {
    url = "http://www.internic.net/domain/named.root";
-    sha256 = "1zf3ydn44z70gq1kd95lvk9cp68xlbl8vqpswqlhd30qafx6v6d1";
+    sha256 = "0qsyxpj5b3i7n162qfyv76ljqbvnwjii7jk8mpfinklx0sk01473";
  };

  rootKey = ./root.key;
@@ -13,7 +13,7 @@ let
 in

 stdenv.mkDerivation {
-  name = "dns-root-data-2017-07-11";
+  name = "dns-root-data-2017-07-26";

  buildCommand = ''
    mkdir $out