Update shell.nix (fixes Mac)

Also clean up a lint error in .golanci.yml Signed-off-by: Nahum Shalman <[email protected]>
tinkerbell · Dec 2, 2021 · c28f5b3 · c28f5b3
1 parent 058a1c9
commit c28f5b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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