Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update shell.nix (fixes Mac) #562

Merged
merged 2 commits into from
Dec 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ linters:
- wastedassign
- whitespace


# Disabled linters, due to being misaligned with Go practices
# - exhaustivestruct
# - gochecknoglobals
Expand Down
2 changes: 1 addition & 1 deletion grpc-server/workflow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion protos/hardware/hardware.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion protos/hardware/hardware.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -14,12 +14,12 @@ mkShell {
git
gnumake
gnused
go
go_1_17
jq
nixfmt
nodePackages.prettier
protobuf
pythonPackages.codespell
python3Packages.codespell
shfmt
shellcheck
vagrant
Expand Down