diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-05-18 14:34:25 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-05-18 16:21:12 +0000 |
| commit | 93e90ca356baed5941e1cccf8c0d8e3e2c460e29 (patch) | |
| tree | f6c26f06a2f830a3f1bab00fdc029b76be8805c6 /nixpkgs/lib | |
| parent | d2753504ef2bd591ade35851dad31d3aac117e19 (diff) | |
| parent | b47873026c7e356a340d0e1de7789d4e8428ac66 (diff) | |
| download | nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.gz nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.bz2 nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.lz nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.xz nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.zst nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.zip | |
Merge commit 'b47873026c7e356a340d0e1de7789d4e8428ac66'
Diffstat (limited to 'nixpkgs/lib')
| -rw-r--r-- | nixpkgs/lib/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/lib/deprecated.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/lib/kernel.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/lib/default.nix b/nixpkgs/lib/default.nix index d00c4abec0a9..e7f59a67abbd 100644 --- a/nixpkgs/lib/default.nix +++ b/nixpkgs/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/nixpkgs/lib/deprecated.nix b/nixpkgs/lib/deprecated.nix index 8c4fe9c390c6..be0ef904c66d 100644 --- a/nixpkgs/lib/deprecated.nix +++ b/nixpkgs/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"; } diff --git a/nixpkgs/lib/kernel.nix b/nixpkgs/lib/kernel.nix index 2ce19f8cb68c..8045a228d05e 100644 --- a/nixpkgs/lib/kernel.nix +++ b/nixpkgs/lib/kernel.nix @@ -14,7 +14,7 @@ with lib; freeform = x: { freeform = x; }; /* - Common patterns/legacy used in common-config/hardened-config.nix + Common patterns/legacy used in common-config/hardened/config.nix */ whenHelpers = version: { whenAtLeast = ver: mkIf (versionAtLeast version ver); |