From 60543c4f9ee05091a0b7aab3620adbc3eeef4b2c Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Sun, 3 Apr 2022 22:29:02 -0400 Subject: [PATCH] go: Drop unnecessary backslash-escape MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no backslash interpretation going on within single-quote strings which means there's no need to escape the backslash. Since this was going on within single-quote strings the $exclude variable ended up having 2 backslashes (`\\`) instead of the intended single backslash. This meant that the regex that was built up was incorrect. For example prometheus' exclude contents before and after this change are: ✕: \(/_\|examples\|Godeps\|testdata\\|documentation/prometheus-mixin\) ✓: \(/_\|examples\|Godeps\|testdata\|documentation/prometheus-mixin\) --- pkgs/development/go-modules/generic/default.nix | 2 +- pkgs/development/go-packages/generic/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index f986d164ee8c..e2428edbb268 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -176,7 +176,7 @@ let IFS=' ' read -r -a excludedArr <<<$excludedPackages printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}" excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf - exclude+='\\|'"$excludedAlternates" + exclude+='\|'"$excludedAlternates" fi exclude+='\)' diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 6e96f443ff9f..3d633324eefe 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -155,7 +155,7 @@ let IFS=' ' read -r -a excludedArr <<<$excludedPackages printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}" excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf - exclude+='\\|'"$excludedAlternates" + exclude+='\|'"$excludedAlternates" fi exclude+='\)'