From c28f5b35bb7aed6e3cb3ed72f5c1379958487a8e Mon Sep 17 00:00:00 2001
From: Nahum Shalman <nshalman@equinix.com>
Date: Thu, 2 Dec 2021 10:07:58 -0500
Subject: [PATCH 1/2] Update shell.nix (fixes Mac)

Also clean up a lint error in .golanci.yml

Signed-off-by: Nahum Shalman <nshalman@equinix.com>
---
 .golangci.yml |  1 -
 shell.nix     | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 9f0aaa67a..72d46eeca 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -154,7 +154,6 @@ linters:
     - wastedassign
     - whitespace
 
-
   # Disabled linters, due to being misaligned with Go practices
   # - exhaustivestruct
   # - gochecknoglobals
diff --git a/shell.nix b/shell.nix
index 7f0926f1f..fa46e0d67 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,10 +1,10 @@
 let _pkgs = import <nixpkgs> { };
 in { pkgs ? import (_pkgs.fetchFromGitHub {
   owner = "NixOS";
-  repo = "nixpkgs-channels";
-  #branch@date: nixpkgs-unstable@2020-09-11
-  rev = "6d4b93323e7f78121f8d6db6c59f3889aa1dd931";
-  sha256 = "0g2j41cx2w2an5d9kkqvgmada7ssdxqz1zvjd7hi5vif8ag0v5la";
+  repo = "nixpkgs";
+  #branch@date: 21.11@2021-12-02
+  rev = "21.11";
+  sha256 = "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg=";
 }) { } }:
 
 with pkgs;
@@ -14,12 +14,12 @@ mkShell {
     git
     gnumake
     gnused
-    go
+    go_1_17
     jq
     nixfmt
     nodePackages.prettier
     protobuf
-    pythonPackages.codespell
+    python3Packages.codespell
     shfmt
     shellcheck
     vagrant

From 9f73ef7725f73672357d00ae3103f99607180488 Mon Sep 17 00:00:00 2001
From: Nahum Shalman <nshalman@equinix.com>
Date: Thu, 2 Dec 2021 15:08:44 -0500
Subject: [PATCH 2/2] Correct spelling found by codespell

Signed-off-by: Nahum Shalman <nshalman@equinix.com>
---
 grpc-server/workflow_test.go   | 2 +-
 protos/hardware/hardware.pb.go | 2 +-
 protos/hardware/hardware.proto | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/grpc-server/workflow_test.go b/grpc-server/workflow_test.go
index 75d0b7b7a..6ae191939 100644
--- a/grpc-server/workflow_test.go
+++ b/grpc-server/workflow_test.go
@@ -71,7 +71,7 @@ func TestCreateWorkflow(t *testing.T) {
 						}, nil
 					},
 					CreateWorkflowFunc: func(ctx context.Context, wf db.Workflow, data string, id uuid.UUID) error {
-						return errors.New("failed to create a workfow")
+						return errors.New("failed to create a workflow")
 					},
 				},
 				wfTemplate: templateID,
diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go
index 284c58ca6..a5a8be435 100644
--- a/protos/hardware/hardware.pb.go
+++ b/protos/hardware/hardware.pb.go
@@ -122,7 +122,7 @@ func (*Empty) Descriptor() ([]byte, []int) {
 
 //
 // GetRequest is the request used by the Get various get methods exposed by the
-// hardware serice.
+// hardware service.
 type GetRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto
index f8efaf877..c9988aaf9 100644
--- a/protos/hardware/hardware.proto
+++ b/protos/hardware/hardware.proto
@@ -94,7 +94,7 @@ message Empty {
 
 /*
  * GetRequest is the request used by the Get various get methods exposed by the
- * hardware serice.
+ * hardware service.
  */
 message GetRequest {
   string mac = 1;