From 49141d2b375c8f739cf5234789cdc356add8991b Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Tue, 7 Jun 2022 14:51:20 -0700 Subject: [PATCH] Import groupBy from lib not builtins * lib.groupBy will default to builtins.groupBy if available, so it is safer to use --- lib/vendorCargoRegistries.nix | 2 +- lib/vendorGitDeps.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vendorCargoRegistries.nix b/lib/vendorCargoRegistries.nix index 1d12c93f..28faae4c 100644 --- a/lib/vendorCargoRegistries.nix +++ b/lib/vendorCargoRegistries.nix @@ -11,7 +11,6 @@ let attrNames concatStringsSep filter - groupBy hasAttr hashString head @@ -25,6 +24,7 @@ let concatStrings escapeShellArg flatten + groupBy hasPrefix mapAttrs' mapAttrsToList diff --git a/lib/vendorGitDeps.nix b/lib/vendorGitDeps.nix index f4640126..7029ef4d 100644 --- a/lib/vendorGitDeps.nix +++ b/lib/vendorGitDeps.nix @@ -10,7 +10,6 @@ let any attrNames filter - groupBy hashString head isString @@ -22,6 +21,7 @@ let concatMapStrings concatStrings escapeShellArg + groupBy hasPrefix last mapAttrs'