diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-11 23:36:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 23:36:23 +0100 |
| commit | dd9c795c6d684b74345e3a616c42a6d6723bd8f1 (patch) | |
| tree | 323f1b7255c56069a10c5945c880a620d3f8a543 | |
| parent | 346de1fb8c3273ea74a0d15ff0580b0d6610a476 (diff) | |
| parent | aff997917095e5e006624eaf8de3f1cd3c52f256 (diff) | |
| download | nixlib-dd9c795c6d684b74345e3a616c42a6d6723bd8f1.tar nixlib-dd9c795c6d684b74345e3a616c42a6d6723bd8f1.tar.gz nixlib-dd9c795c6d684b74345e3a616c42a6d6723bd8f1.tar.bz2 nixlib-dd9c795c6d684b74345e3a616c42a6d6723bd8f1.tar.lz nixlib-dd9c795c6d684b74345e3a616c42a6d6723bd8f1.tar.xz nixlib-dd9c795c6d684b74345e3a616c42a6d6723bd8f1.tar.zst nixlib-dd9c795c6d684b74345e3a616c42a6d6723bd8f1.zip | |
Merge pull request #87630 from emilazy/fix-fake-sri
| -rw-r--r-- | lib/default.nix | 2 | ||||
| -rw-r--r-- | lib/deprecated.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix index d00c4abec0a9..e7f59a67abbd 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -141,7 +141,7 @@ let mergeAttrsWithFunc mergeAttrsConcatenateValues mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults mergeAttrsByFuncDefaultsClean mergeAttrBy - fakeSri fakeSha256 fakeSha512 + fakeHash fakeSha256 fakeSha512 nixType imap; inherit (versions) splitVersion; diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 8c4fe9c390c6..be0ef904c66d 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -272,7 +272,7 @@ rec { imap = imap1; # Fake hashes. Can be used as hash placeholders, when computing hash ahead isn't trivial - fakeSri = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + fakeHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; fakeSha256 = "0000000000000000000000000000000000000000000000000000000000000000"; fakeSha512 = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; } |