Merge pull request #306 from DeterminateSystems/update-go-deps

Update Go dependencies
DeterminateSystems · Dec 19, 2023 · 22a258b · 22a258b · vercel · Dec 19, 2023
2 parents 483b95e + b19d0a8
commit 22a258b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 30 deletions.
diff --git a/nix/templates/pkg/go/flake.lock b/nix/templates/pkg/go/flake.lock
diff --git a/nix/templates/pkg/go/flake.nix b/nix/templates/pkg/go/flake.nix
@@ -3,13 +3,9 @@
 
   inputs = {
     nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2305.491812.tar.gz";
-    gitignore = {
-      url = "github:hercules-ci/gitignore.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, gitignore }:
+  outputs = { self, nixpkgs }:
     let
       # Systems supported
       allSystems = [
@@ -28,8 +24,8 @@
       packages = forAllSystems ({ pkgs }: {
         default = pkgs.buildGoModule {
           name = "zero-to-nix-go";
-          src = gitignore.lib.gitignoreSource ./.;
-          vendorSha256 = "sha256-fwJTg/HqDAI12mF1u/BlnG52yaAlaIMzsILDDZuETrI=";
+          src = ./.;
+          vendorSha256 = "sha256-pYnN8rxXNNLRegvJySwAyMUPBmnhSiDSHfMQpjB9Qjs=";
         };
       });
     };

diff --git a/nix/templates/pkg/go/go.mod b/nix/templates/pkg/go/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	golang.org/x/arch v0.6.0 // indirect
-	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect

diff --git a/nix/templates/pkg/go/go.sum b/nix/templates/pkg/go/go.sum
@@ -70,6 +70,8 @@ golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
 golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
 golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

diff --git a/src/pages/start/4.nix-build.mdx b/src/pages/start/4.nix-build.mdx
@@ -286,7 +286,7 @@ Here's the package definition that enables us to build this Go package:
 ```nix filename=flake.nix
 packages.default = pkgs.buildGoModule {
   name = "zero-to-nix-go";
-  src = gitignore.lib.gitignoreSource ./.;
+  src = ./.;
   vendorSha256 = "sha256-fwJTg/HqDAI12mF1u/BlnG52yaAlaIMzsILDDZuETrI=";
 };
 ```