Merge staging-next into staging

2019-01-13 14:46:43 +01:00
parent a1a5ea5943 3131a8ea84
commit bb9581cd88
139 changed files with 2282 additions and 572 deletions
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -132,6 +132,7 @@ let
      mergeAttrsWithFunc mergeAttrsConcatenateValues
      mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults
      mergeAttrsByFuncDefaultsClean mergeAttrBy
+      fakeSha256 fakeSha512
      nixType imap;
  });
 in lib
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -270,4 +270,8 @@ rec {
     starting at zero.
  */
  imap = imap1;
+
+  # Fake hashes. Can be used as hash placeholders, when computing hash ahead isn't trivial
+  fakeSha256 = "0000000000000000000000000000000000000000000000000000000000000000";
+  fakeSha512 = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
 }