From b2feaf6b405e38c632c70d65f134ac02a1ba0600 Mon Sep 17 00:00:00 2001 From: Felix Scheinost <31761492+felixscheinost@users.noreply.github.com> Date: Wed, 15 Feb 2023 17:36:06 +0100 Subject: [PATCH] #15 Fix empty line regex on darwin (#16) --- jobs/generators/istio/default.nix | 2 +- jobs/generators/k8s/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/generators/istio/default.nix b/jobs/generators/istio/default.nix index cb1de5a..004ce15 100644 --- a/jobs/generators/istio/default.nix +++ b/jobs/generators/istio/default.nix @@ -20,7 +20,7 @@ with lib; let then "null" else builtins.toString value; - removeEmptyLines = str: concatStringsSep "\n" (filter (l: (builtins.match "( |)+" l) == null) (splitString "\n" str)); + removeEmptyLines = str: concatStringsSep "\n" (filter (l: builtins.match "[[:space:]]*" l != []) (splitString "\n" str)); mkOption = { description ? null, diff --git a/jobs/generators/k8s/default.nix b/jobs/generators/k8s/default.nix index 43ec4b9..340e430 100644 --- a/jobs/generators/k8s/default.nix +++ b/jobs/generators/k8s/default.nix @@ -21,7 +21,7 @@ with lib; let then "null" else builtins.toString value; - removeEmptyLines = str: concatStringsSep "\n" (filter (l: (builtins.match "( |)+" l) == null) (splitString "\n" str)); + removeEmptyLines = str: concatStringsSep "\n" (filter (l: builtins.match "[[:space:]]*" l != []) (splitString "\n" str)); mkOption = { description ? null,