aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/lib/default.nix
diff options
context:
space:
mode:
authorKatharina Fey <kookie@spacekookie.de>2020-05-20 01:39:43 +0200
committerKatharina Fey <kookie@spacekookie.de>2020-05-20 01:39:43 +0200
commit1849de11ec1e32e9eebb83f24d5339bea88b7ed7 (patch)
tree0aaf3cead09c2d55c67c6f6a86ad20af399797d8 /nixpkgs/lib/default.nix
parent304c06d7a7ea3f5c84031d325ece8d38b8c1d829 (diff)
parent0f5ce2fac0c726036ca69a5524c59a49e2973dd4 (diff)
Merge commit '0f5ce2fac0c726036ca69a5524c59a49e2973dd4'
Diffstat (limited to 'nixpkgs/lib/default.nix')
-rw-r--r--nixpkgs/lib/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/lib/default.nix b/nixpkgs/lib/default.nix
index d00c4abec0a..e7f59a67abb 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;