Merge master into staging-next

2019-10-24 08:27:04 +02:00
parent 09c9a2de7e 7044058ef7
commit 32389de159
66 changed files with 496 additions and 300 deletions
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -4,15 +4,6 @@ buildGoModule rec {
  pname = "conftest";
  version = "0.14.0";

-  # Something subtle in the go sum db is causing every download to
-  # get a new sum (and thus breaking the hash). This disables the
-  # fetching of the sum from the go sum database.
-  modBuildPhase = ''
-    runHook preBuild
-    GONOSUMDB=* go mod download
-    runHook postBuild
-  '';
-
  src = fetchFromGitHub {
    owner = "instrumenta";
    repo = "conftest";