diff options
| author | Manuel Mendez <mmendez534@gmail.com> | 2022-04-08 14:21:45 -0400 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-04-09 09:57:35 +1000 |
| commit | ddcc7c67d280eb0ea76a9079c49c9f70c6cc2e4f (patch) | |
| tree | 9c90fdaf2221ec2ad1be0cb25f56c1dd8285b86f | |
| parent | 6443a5d6da0afbbee235781bdeb964436a59bc8c (diff) | |
| download | nixpkgs-ddcc7c67d280eb0ea76a9079c49c9f70c6cc2e4f.tar nixpkgs-ddcc7c67d280eb0ea76a9079c49c9f70c6cc2e4f.tar.gz nixpkgs-ddcc7c67d280eb0ea76a9079c49c9f70c6cc2e4f.tar.bz2 nixpkgs-ddcc7c67d280eb0ea76a9079c49c9f70c6cc2e4f.tar.lz nixpkgs-ddcc7c67d280eb0ea76a9079c49c9f70c6cc2e4f.tar.xz nixpkgs-ddcc7c67d280eb0ea76a9079c49c9f70c6cc2e4f.tar.zst nixpkgs-ddcc7c67d280eb0ea76a9079c49c9f70c6cc2e4f.zip | |
go: Apply package exclusion equally
The exclusion logic was moved out of getGoDirs but only buildPhase was updated causing checkPhase to possibly fail. This happened in golint as it has go files in testdata that are meant as testdata files and not go packages to test which caused the checkPhase to fail. Fixes #167717
| -rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/go-packages/generic/default.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index e2428edbb26..502a981596e 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -204,7 +204,7 @@ let if [ -n "$subPackages" ]; then echo "$subPackages" | sed "s,\(^\| \),\1./,g" else - find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique + find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique | grep -v "$exclude" fi } @@ -221,7 +221,6 @@ let export NIX_BUILD_CORES=1 fi for pkg in $(getGoDirs ""); do - grep -q "$exclude" <<<$pkg && continue echo "Building subPackage $pkg" buildGoDir install "$pkg" done diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 3d633324eef..0559f7f07a7 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -184,7 +184,7 @@ let echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" else pushd "$NIX_BUILD_TOP/go/src" >/dev/null - find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq + find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq | grep -v "$exclude" popd >/dev/null fi } @@ -202,7 +202,6 @@ let export NIX_BUILD_CORES=1 fi for pkg in $(getGoDirs ""); do - grep -q "$exclude" <<<$pkg && continue echo "Building subPackage $pkg" buildGoDir install "$pkg" done |