From d2b5afe9074e591e98a72821383cda826bd80ebe Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Fri, 8 Jul 2022 17:13:13 +0200
Subject: [PATCH] flake,ci: reenable GOPROXY var default

...mainly due to arbitrarily failing ci builds, as this doesn't appear
to affect local builds/nix builds on remote builders, just fresh builds
in the ci.
the explanation for why this is happening might be that certain package
VCS's don't allow many/frequent connections from IP ranges other than
GOPROXY's (Google's).
that is sheer speculation, though.
however, it is still true that there are "no" failed ci builds with
GOPROXY env var set to its default value (left untouched), which does
indeed indicate that the above mentioned might be the root cause of the
issue after all.

this commit reverts:
    * https://git.dotya.ml/wanderer/go-xkcdreader/commit/f3e481395eebaf9840d5166202e8e5a84fdd2fa8
and partially reverts:
    * https://git.dotya.ml/wanderer/go-xkcdreader/commit/14ba7b18bf69454bf53958f7556bdc95885c68a6

GOPROXY=direct has been kept for `nix-shell`/`nix develop` environments
as that is not where it poses an issue.
---
 .drone.starlark | 12 ------------
 flake.nix       |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.drone.starlark b/.drone.starlark
index 6511bad..2369e14 100644
--- a/.drone.starlark
+++ b/.drone.starlark
@@ -7,9 +7,6 @@ def main(ctx):
 			"kind": "pipeline",
 			"type": "docker",
 			"name": "golangci-lint",
-			"environment": {
-				"GOPROXY": "direct"
-			},
 			"steps": [
 				{
 					"name": "golangci-lint",
@@ -33,9 +30,6 @@ def main(ctx):
 			"node": {
 				"r": "w"
 			},
-			"environment": {
-				"GOPROXY": "direct"
-			},
 			"steps": [
 				{
 					"name": "pull nix",
@@ -282,9 +276,6 @@ def main(ctx):
 			"node": {
 				"r": "w"
 			},
-			"environment": {
-				"GOPROXY": "direct"
-			},
 			"steps": [
 				{
 					"name": "pull archlinux",
@@ -362,9 +353,6 @@ def main(ctx):
 			"node": {
 				"r": "w"
 			},
-			"environment": {
-				"GOPROXY": "direct"
-			},
 			"steps": [
 				{
 					"name": "pull fedora",
diff --git a/flake.nix b/flake.nix
index 69d60d3..6b2e986 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,7 +77,7 @@
             nativeBuildInputs = [ pkgconfig ];
 
             overrideModAttrs = _: {
-              GOPROXY = "direct";
+              # GOPROXY = "direct";
             };
 
             inherit version;
@@ -93,7 +93,7 @@
 
             modSha256 = lib.fakeSha256;
             # dont't forget to update vendorSha256 whenever go.mod or go.sum change
-            vendorSha256 = "sha256-gaIoacCs0PcvmFW8dQOFUb9KU1u6KUiFmGQ/ERcVwjc=";
+            vendorSha256 = "sha256-LvdcTbj8cFlaIBsq1VLfLF2Tu9HiZzGO8igD766nMLE=";
 
             # In 'nix develop', we don't need a copy of the source tree
             # in the Nix store.