diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-07-27 15:13:31 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-27 15:13:31 +0700 |
commit | b63a54f81ce96391e6da6aab5965926e7cdbce47 (patch) | |
tree | ae8f9eca6965b3eb7e919548723c46ba663525c2 /pkgs | |
parent | d82543f22d9e778a051ee866e6d2d8716a1cae0d (diff) | |
parent | 1c2a2b0a0848d58407fb4ff73a8dc1e854f5a270 (diff) | |
download | nixpkgs-b63a54f81ce96391e6da6aab5965926e7cdbce47.tar nixpkgs-b63a54f81ce96391e6da6aab5965926e7cdbce47.tar.gz nixpkgs-b63a54f81ce96391e6da6aab5965926e7cdbce47.tar.bz2 nixpkgs-b63a54f81ce96391e6da6aab5965926e7cdbce47.tar.lz nixpkgs-b63a54f81ce96391e6da6aab5965926e7cdbce47.tar.xz nixpkgs-b63a54f81ce96391e6da6aab5965926e7cdbce47.tar.zst nixpkgs-b63a54f81ce96391e6da6aab5965926e7cdbce47.zip |
Merge pull request #110742 from siraben/deprecate-fold
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 598dac90bab..7f4f0f2d6bb 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -70,7 +70,7 @@ assert stdenv.isLinux; let # Combine the `features' attribute sets of all the kernel patches. - kernelFeatures = lib.fold (x: y: (x.features or {}) // y) ({ + kernelFeatures = lib.foldr (x: y: (x.features or {}) // y) ({ iwlwifi = true; efiBootStub = true; needsCifsUtils = true; diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 4ee45bf4bc8..fbb6fdb0fe0 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -77,7 +77,7 @@ rec { in if fn != null then [{key = fn;}] ++ xs else xs; - in pkgs.lib.fold foundDeps [] deps; + in pkgs.lib.foldr foundDeps [] deps; }; |