diff options
Diffstat (limited to 'pkgs')
-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 |