From e88eb66c2b5e7066786f5d6343f3737567a71734 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 27 Jul 2024 13:35:35 +1000 Subject: [PATCH] `mapAttrsFlatten` -> `mapAttrsToList` deprecated in https://github.com/NixOS/nixpkgs/commit/473e469d5a921a57b484a09d446cee6c231cd592 --- modules/environment/default.nix | 2 +- modules/programs/fish.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/environment/default.nix b/modules/environment/default.nix index bb996222f..3b97a3ec2 100644 --- a/modules/environment/default.nix +++ b/modules/environment/default.nix @@ -9,7 +9,7 @@ let mapAttrsToList (n: v: ''export ${n}="${v}"'') cfg.variables; aliasCommands = - mapAttrsFlatten (n: v: ''alias ${n}=${escapeShellArg v}'') + mapAttrsToList (n: v: ''alias ${n}=${escapeShellArg v}'') (filterAttrs (k: v: v != null) cfg.shellAliases); makeDrvBinPath = concatMapStringsSep ":" (p: if isDerivation p then "${p}/bin" else p); diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index 77276e671..4b76e02e8 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -9,7 +9,7 @@ let cfg = config.programs.fish; fishAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") + mapAttrsToList (k: v: "alias ${k} ${escapeShellArg v}") (filterAttrs (k: v: v != null) cfg.shellAliases) );