diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-12 12:01:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 12:01:23 +0000 |
| commit | bc41da4eb9c0f4a01633006b128a05d4469ec935 (patch) | |
| tree | c9c13970b1f13b33f4e13066b022f6b2eb390ef5 /pkgs/build-support | |
| parent | 822f9981e2cd2be8c561a57d4c03dd729c051b31 (diff) | |
| parent | 3a671cd64d03f4e55eb6c817d6294910e0ccc133 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/nix-gitignore/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/build-support/nix-gitignore/default.nix index d55465302e44e..f8e673a2a7f50 100644 --- a/pkgs/build-support/nix-gitignore/default.nix +++ b/pkgs/build-support/nix-gitignore/default.nix @@ -45,7 +45,7 @@ in rec { escs = "\\*?"; splitString = let recurse = str : [(substring 0 1 str)] ++ - (if str == "" then [] else (recurse (substring 1 (stringLength(str)) str) )); + (lib.optionals (str != "") (recurse (substring 1 (stringLength(str)) str) )); in str : recurse str; chars = s: filter (c: c != "" && !isList c) (splitString s); escape = s: map (c: "\\" + c) (chars s); |