Merge branch 'main' into dependabot/go_modules/github.com/go-logr/zap…

…r-1.2.4
tinkerbell · May 13, 2023 · 8d3dc72 · 8d3dc72
2 parents 040f524 + 861779b
commit 8d3dc72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -240,5 +240,5 @@ yamllint: $(YAMLLINT_BIN)
 
 .PHONY: _protoc ## Install all required tools for use with this Makefile.
 _protoc:
-	$(GO) install $(PROTOC_GEN_GO)
-	$(GO) install $(PROTOC_GEN_GO_GRPC)
+	GOBIN=$${PWD}/bin $(GO) install $(PROTOC_GEN_GO)
+	GOBIN=$${PWD}/bin $(GO) install $(PROTOC_GEN_GO_GRPC)
diff --git a/shell.nix b/shell.nix
@@ -11,6 +11,8 @@ with pkgs;
 
 mkShell {
   buildInputs = [
+    git
+    gnumake
     jq
     nixfmt
     nodePackages.prettier
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,8 @@ with pkgs; @@
     mkShell {
       buildInputs = [
+        git
+        gnumake
         jq
         nixfmt
         nodePackages.prettier
@@ Expand Down @@