From bd023200a94d6243a59c040dccb1aebd42f74646 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 4 Sep 2019 14:46:45 +0200 Subject: [PATCH 01/31] go_1_13: init at 1.13.1 --- pkgs/development/compilers/go/1.13.nix | 239 ++++++++++++++++++ .../compilers/go/remove-test-pie-1.13.patch | 34 +++ .../compilers/go/ssl-cert-file-1.13.patch | 64 +++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 341 insertions(+) create mode 100644 pkgs/development/compilers/go/1.13.nix create mode 100644 pkgs/development/compilers/go/remove-test-pie-1.13.patch create mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.13.patch diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix new file mode 100644 index 00000000000..2ff10d528d8 --- /dev/null +++ b/pkgs/development/compilers/go/1.13.nix @@ -0,0 +1,239 @@ +{ stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, mailcap, runtimeShell +, buildPackages, pkgsTargetTarget +}: + +let + + inherit (stdenv.lib) optionals optionalString; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${buildPackages.go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.13.1"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "0n4k42bbrj5g9b1kczkfsih049v43vqzaps7n69gmfa4jpk59wc1"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + substituteInPlace src/mime/type_unix.go \ + --replace '/etc/mime.types' '${mailcap}/etc/mime.types' + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.13.patch + ./remove-test-pie-1.13.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests.patch + ./skip-nohup-tests.patch + # breaks under load: https://github.com/golang/go/issues/25628 + ./skip-test-extra-files-on-386.patch + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" + else + null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + # Independent from host/target, CC should produce code for the building system. + export CC=${buildPackages.stdenv.cc}/bin/cc + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ goBootstrap ]; + + meta = with stdenv.lib; { + branch = "1.13"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/remove-test-pie-1.13.patch b/pkgs/development/compilers/go/remove-test-pie-1.13.patch new file mode 100644 index 00000000000..05f18b813f9 --- /dev/null +++ b/pkgs/development/compilers/go/remove-test-pie-1.13.patch @@ -0,0 +1,34 @@ +diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go +index f63c94697c..f02eff7064 100644 +--- a/src/cmd/dist/test.go ++++ b/src/cmd/dist/test.go +@@ -574,29 +574,6 @@ func (t *tester) registerTests() { + }) + } + +- // Test internal linking of PIE binaries where it is supported. +- if goos == "linux" && (goarch == "amd64" || goarch == "arm64") { +- t.tests = append(t.tests, distTest{ +- name: "pie_internal", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- // Also test a cgo package. +- if t.cgoEnabled { +- t.tests = append(t.tests, distTest{ +- name: "pie_internal_cgo", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- } +- } +- + // sync tests + if goos != "js" { // js doesn't support -cpu=10 + t.tests = append(t.tests, distTest{ diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.13.patch b/pkgs/development/compilers/go/ssl-cert-file-1.13.patch new file mode 100644 index 00000000000..02a50d9c72f --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file-1.13.patch @@ -0,0 +1,64 @@ +diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +index 255a8d3525..a467255a54 100644 +--- a/src/crypto/x509/root_cgo_darwin.go ++++ b/src/crypto/x509/root_cgo_darwin.go +@@ -280,6 +280,8 @@ int CopyPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots, bool debugDa + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + +@@ -295,6 +297,13 @@ func loadSystemRoots() (*CertPool, error) { + buf := C.GoBytes(unsafe.Pointer(C.CFDataGetBytePtr(data)), C.int(C.CFDataGetLength(data))) + roots := NewCertPool() + roots.AppendCertsFromPEM(buf) ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + if C.CFDataGetLength(untrustedData) == 0 { + return roots, nil +diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +index 2f6a8b8d60..b81889fe69 100644 +--- a/src/crypto/x509/root_darwin.go ++++ b/src/crypto/x509/root_darwin.go +@@ -92,6 +92,14 @@ func execSecurityRoots() (*CertPool, error) { + verifyCh = make(chan rootCandidate) + ) + ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ + // Using 4 goroutines to pipe into verify-cert seems to be + // about the best we can do. The verify-cert binary seems to + // just RPC to another server with coarse locking anyway, so +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index 48de50b4ea..750e12c6b4 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -38,6 +38,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7612c39f2e4..5ce994da2df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7955,6 +7955,10 @@ in inherit (darwin.apple_sdk.frameworks) Security Foundation; }; + go_1_13 = callPackage ../development/compilers/go/1.13.nix { + inherit (darwin.apple_sdk.frameworks) Security Foundation; + }; + go = go_1_12; go-repo-root = callPackage ../development/tools/go-repo-root { }; From bdd503323a3d8b17bb23cc20c46db022ebb81c46 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 4 Sep 2019 14:46:59 +0200 Subject: [PATCH 02/31] go: default to go_1_13 --- pkgs/top-level/all-packages.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ce994da2df..d72b57af7e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7959,7 +7959,7 @@ in inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go = go_1_12; + go = go_1_13; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -14433,14 +14433,21 @@ in buildGo112Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_12; }; + buildGo113Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_13; + }; - buildGoPackage = buildGo112Package; + buildGoPackage = buildGo113Package; buildGo112Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_12; }; - buildGoModule = buildGo112Module; + buildGo113Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_13; + }; + + buildGoModule = buildGo113Module; go2nix = callPackage ../development/tools/go2nix { }; From 4ef3de864573891748b7b24e2ca35c21dc6fe1b9 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 10 Sep 2019 21:23:53 +0200 Subject: [PATCH 03/31] ctop: ensure go 1.13 compatibility --- pkgs/tools/system/ctop/default.nix | 6 ++ pkgs/tools/system/ctop/go-1.13-deps.patch | 90 +++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 pkgs/tools/system/ctop/go-1.13-deps.patch diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index effc879e478..8d8b710750c 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -11,6 +11,12 @@ buildGoModule rec { sha256 = "0mm6hl5qklfv0yffj6cgypsgcrk4fq6p60djycfgj20yhz9cmf9x"; }; + patches = [ + # Version 0.7.2 does not build with go 1.13. + # TODO: Remove once(and if) https://github.com/bcicen/ctop/pull/178 is merged and lands in a release. + ./go-1.13-deps.patch + ]; + modSha256 = "0ad1gvamckg94r7f68cnjdbq9nyz6c3hh339hy4hghxd3rd1qskn"; meta = with lib; { diff --git a/pkgs/tools/system/ctop/go-1.13-deps.patch b/pkgs/tools/system/ctop/go-1.13-deps.patch new file mode 100644 index 00000000000..153c0f36f81 --- /dev/null +++ b/pkgs/tools/system/ctop/go-1.13-deps.patch @@ -0,0 +1,90 @@ +diff --git a/go.mod b/go.mod +index 4921cba..cbb4028 100644 +--- a/go.mod ++++ b/go.mod +@@ -18,9 +18,6 @@ require ( + github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 // indirect + github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 // indirect + github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c +- github.com/kr/pretty v0.1.0 // indirect +- github.com/maruel/panicparse v0.0.0-20170227222818-25bcac0d793c // indirect +- github.com/maruel/ut v1.0.0 // indirect + github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c // indirect + github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect + github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 +@@ -39,3 +36,5 @@ require ( + ) + + replace github.com/gizak/termui => github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5 ++ ++go 1.13 +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..5ca7d55 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,64 @@ ++github.com/Azure/go-ansiterm v0.0.0-20160622173216-fa152c58bc15 h1:VtP6TygBMvrR+SMMPHj3z3jvnj4vcafMRLIw4at7xww= ++github.com/Azure/go-ansiterm v0.0.0-20160622173216-fa152c58bc15/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= ++github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY= ++github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= ++github.com/Microsoft/go-winio v0.3.8 h1:dvxbxtpTIjdAbx2OtL26p4eq0iEvys/U5yrsTJb3NZI= ++github.com/Microsoft/go-winio v0.3.8/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= ++github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= ++github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= ++github.com/Sirupsen/logrus v0.0.0-20150423025312-26709e271410 h1:RxP6uUzJlS1Qa3+HYls3u+nQMKlnqC3RhL7wWC4Y4+E= ++github.com/Sirupsen/logrus v0.0.0-20150423025312-26709e271410/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U= ++github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5 h1:2pI3ZsoefWIi++8EqmANoC7Px/v2lRwnleVUcCuFgLg= ++github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5/go.mod h1:yIA9ITWZD1p4/DvCQ44xvhyVb9XEUlVnY1rzGSHwbiM= ++github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd h1:xqaBnULC8wEnQpRDXAsDgXkU/STqoluz1REOoegSfNU= ++github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE= ++github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d h1:MJ4ge3i0lehw+gE3JcGUUp8TmWjsLAlQlhmdASs/9wk= ++github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= ++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/docker/docker v0.0.0-20170502054910-90d35abf7b35 h1:ly3dRUfvdP5i/t9iqVHd2VQQIDtO3tpfFWPah7g4CFw= ++github.com/docker/docker v0.0.0-20170502054910-90d35abf7b35/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= ++github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204 h1:JYhQLEn7v7EtrpA9ByRz51gwlk8qt12EGP9XlbX/qw4= ++github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= ++github.com/docker/go-units v0.3.2 h1:Kjm80apys7gTtfVmCvVY8gwu10uofaFSrmAKOVrtueE= ++github.com/docker/go-units v0.3.2/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= ++github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2 h1:JuVaWSoRMBrstn2l8cxKXjK8l/qurk5qyJ9dq7EIQmU= ++github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2/go.mod h1:KpcjM623fQYE9MZiTGzKhjfxXAV9wbyX2C1cyRHfhl0= ++github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 h1:oIgNYSrSUbNH5DJh6DMhU1PiOKOYIHNxrV3djLsLpEI= ++github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= ++github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 h1:ulJ2cj/xlDlrwLCvWH4UeV9vJ/jXP6wEGgTSF7EOnmQ= ++github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 h1:67fHcS+inUoiIqWCKIqeDuq2AlPHNHPiTqp97LdQ+bc= ++github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= ++github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c h1:/hc+TxW4Q1v6aqNPHE5jiaNF2xEK0CzWTgo25RQhQ+U= ++github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c/go.mod h1:FJRkXmPrkHw0WDjB/LXMUhjWJ112Y6JUYnIVBOy8oH8= ++github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c h1:eFzthqtg3W6Pihj3DMTXLAF4f+ge5r5Ie5g6HLIZAF0= ++github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= ++github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= ++github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= ++github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 h1:fcs71SMqqDhUD+PbpIv9xf3EH9F9s6HfiLwr6jKm1VA= ++github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= ++github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= ++github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= ++github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 h1:J1QZwDXgZ4dJD2s19iqR9+U00OWM2kDzbf1O/fmvCWg= ++github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= ++github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= ++github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e h1:HJbgNpzYMeTLPpkMwbPNTPlhNd9r4xQtqcZG6qoIGgs= ++github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= ++github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= ++github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= ++github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b h1:UzwAjzrPQVJoxLfb26YI2WRrhD3g09ZHt9vAQckWiPY= ++github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= ++github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc h1:0HAHLwEY4k1VqaO1SzBi4XxT0KA06Cv+QW2LXknBk9g= ++github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= ++github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4= ++github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= ++golang.org/x/net v0.0.0-20170308210134-a6577fac2d73 h1:5kGFsglTK4KqaHYb/WCmYmj+Gm1+dzbilbtzruHj6dw= ++golang.org/x/net v0.0.0-20170308210134-a6577fac2d73/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= ++golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sys v0.0.0-20170308153327-99f16d856c98 h1:U3NsAsR1IG0Aet3Z+IToBDWbPoJ7hjwgDpqqch4APkU= ++golang.org/x/sys v0.0.0-20170308153327-99f16d856c98/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From ea0b765208720e94acc6d555f51ed2b8df2d87ec Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 10 Sep 2019 18:19:06 +0200 Subject: [PATCH 04/31] all-packages: use go 1.12 for consul --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d72b57af7e2..1a32bfc78d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1373,7 +1373,11 @@ in compactor = callPackage ../applications/networking/compactor { }; - consul = callPackage ../servers/consul { }; + consul = callPackage ../servers/consul { + # Version 1.6.0 fails to build with go 1.13 due to broken dependency: + # go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go:11:2: code in directory /build/go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate expects import "github.com/lyft/protoc-gen-validate/validate" + buildGoPackage = buildGo112Package; + }; consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; From 2d7e8e1b0fce31e1a8437027f20a96491e09cfa6 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 10 Sep 2019 18:50:07 +0200 Subject: [PATCH 05/31] all-packages: use go 1.12 for perkeep --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a32bfc78d8..3bd4047f9d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17699,7 +17699,11 @@ in poppler = poppler_0_61; }; - perkeep = callPackage ../applications/misc/perkeep { }; + perkeep = callPackage ../applications/misc/perkeep { + # Revision c9f78d02adf9740f3b8d403a1418554293cc9f41 fails to build with go 1.13 due to a dependency: + # go: bazil.org/fuse@v0.0.0-20160811212531-371fbbdaa898: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:36526->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; From 9e5f063058bb4e9652281916e0ecbef65665b844 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:36:48 +0200 Subject: [PATCH 06/31] all-packages: use go 1.12 for wtf --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bd4047f9d3..39811184105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24915,7 +24915,9 @@ in zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { }; + wtf = callPackage ../applications/misc/wtf { + buildGoModule = buildGo112Module; + }; zk-shell = callPackage ../applications/misc/zk-shell { }; From 01721f144968b898af74228dd1bcc52462d6e464 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:43:58 +0200 Subject: [PATCH 07/31] all-packages: use go 1.12 for bazel-watcher --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39811184105..24b607fdaa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9283,7 +9283,9 @@ in bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { + go = go_1_12; + }; bazelisk = callPackage ../development/tools/bazelisk { }; From 2f20deb2024bdcc051317f61263b865cd8d70954 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:46:07 +0200 Subject: [PATCH 08/31] all-packages: use go 1.12 for cri-o --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24b607fdaa9..fde4b59260b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22051,7 +22051,9 @@ in crispyDoom = callPackage ../games/crispy-doom { }; - cri-o = callPackage ../applications/virtualization/cri-o {}; + cri-o = callPackage ../applications/virtualization/cri-o { + buildGoPackage = buildGo112Package; + }; ckan = callPackage ../games/ckan { }; From db6cb37aa72b16d2f0f9b459129e1e1ff6811a81 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:51:15 +0200 Subject: [PATCH 09/31] all-packages: use go 1.12 for curlie --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde4b59260b..adf51146fb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2527,7 +2527,11 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; - curlie = callPackage ../tools/networking/curlie { }; + curlie = callPackage ../tools/networking/curlie { + # Version 1.2.0 fails to build with go 1.13 due to: + # verifying golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: Get https://sum.golang.org/lookup/golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:49088->[::1]:53: read: connection refused + buildGoModule = buildGo112Module; + }; cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; From ee2c8ece9e3960669775d7947ae11f1d33829578 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:53:12 +0200 Subject: [PATCH 10/31] all-packages: use go 1.12 for gotestsum --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adf51146fb7..4f45a15f0c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16346,7 +16346,11 @@ in gotests = callPackage ../development/tools/gotests { }; - gotestsum = callPackage ../development/tools/gotestsum { }; + gotestsum = callPackage ../development/tools/gotestsum { + # Version 0.3.5 fails to build with go 1.13: + # build ./testjson/internal/badmain: cannot find module for path ./testjson/internal/badmain + buildGoModule = buildGo112Module; + }; impl = callPackage ../development/tools/impl { }; From 745b2994035fc62af5963e6ba182337385ef89fd Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 22:58:43 +0200 Subject: [PATCH 11/31] all-packages: use go 1.12 for grpcui --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f45a15f0c7..39cf77f8044 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3618,7 +3618,9 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; - grpcui = callPackage ../tools/networking/grpcui { }; + grpcui = callPackage ../tools/networking/grpcui { + buildGoModule = buildGo112Module; + }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; From 7ddd2a206984bc2b2a5a98e5d19bb5a62b3d57e3 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 23:16:31 +0200 Subject: [PATCH 12/31] all-packages: use go 1.12 for lnd --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39cf77f8044..897223b47a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21912,7 +21912,9 @@ in }; litecoind = litecoin.override { withGui = false; }; - lnd = callPackage ../applications/blockchains/lnd.nix { }; + lnd = callPackage ../applications/blockchains/lnd.nix { + buildGoModule = buildGo112Module; + }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; From 72a6ab4d5fb08943720bddffba9ad9a862983e95 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 23:36:02 +0200 Subject: [PATCH 13/31] all-packages: use go 1.12 for scaleway-cli --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 897223b47a6..c4a080248e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22523,7 +22523,9 @@ in sauerbraten = callPackage ../games/sauerbraten {}; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { + buildGoPackage = buildGo112Package; + }; scid = callPackage ../games/scid { tcl = tcl-8_5; From b63b95f1414f2fa05bd5e26a54444f71fe20b9f1 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 23:39:25 +0200 Subject: [PATCH 14/31] all-packages: use go 1.12 for tendermint --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4a080248e2..a7283934e19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20946,7 +20946,9 @@ in telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; - tendermint = callPackage ../tools/networking/tendermint {}; + tendermint = callPackage ../tools/networking/tendermint { + buildGoModule = buildGo112Module; + }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; From a3341e8499994498dc371ce3da23caac333e2dc8 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 16 Sep 2019 23:46:42 +0200 Subject: [PATCH 15/31] all-packages: use go 1.12 for restic --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7283934e19..46d5d133e09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15198,7 +15198,11 @@ in redstore = callPackage ../servers/http/redstore { }; - restic = callPackage ../tools/backup/restic { }; + restic = callPackage ../tools/backup/restic { + # Version 0.9.5 fails to build with go 1.13 due to dependency: + # go: bazil.org/fuse@v0.0.0-20180421153158-65cc252bf669: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:56450->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }; restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; From cf6e2776f2be8c2ebd810ab756ab1a9a224971c8 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 17 Sep 2019 00:25:43 +0200 Subject: [PATCH 16/31] all-packages: use go 1.12 for packr --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46d5d133e09..5f3a7c52656 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -260,7 +260,11 @@ in packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { }; + packr = callPackage ../development/libraries/packr { + # Version 2.6.0 fails to build with go 1.13 due to nested modules: + # go: directory v2/packr2 is outside main module + buildGoModule = buildGo112Module; + }; pet = callPackage ../development/tools/pet { }; From fcdc280d7f8460603db116dea3964b9ef20d22e9 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 17 Sep 2019 00:29:15 +0200 Subject: [PATCH 17/31] all-packages: use go 1.12 for terraform-lsp --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f3a7c52656..4beb5a92d7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10191,7 +10191,11 @@ in terracognita = callPackage ../development/tools/misc/terracognita { }; - terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { + # Version 0.0.5 fails to build with go 1.13 due to dependency: + # build github.com/juliosueiras/terraform-lsp: cannot load github.com/googleapis/gax-go/v2: github.com/googleapis/gax-go@v2.0.0+incompatible: reading file:///nix/store/ihiyd3mqa5gvfm2k2716hpl16knak798-terraform-lsp-0.0.5-go-modules/github.com/googleapis/gax-go/@v/v2.0.0+incompatible.zip: Not Found + buildGoModule = buildGo112Module; + }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; From 8c33df9d65750410c64ce8ad26125a1a5bc936c4 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 17 Sep 2019 00:47:28 +0200 Subject: [PATCH 18/31] all-packages: use go 1.12 for terraform-providers.elasticsearch --- .../networking/cluster/terraform-providers/default.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index fc6b7131385..83157c90a48 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,6 +2,7 @@ , buildGoPackage , fetchFromGitHub , callPackage +, buildGo112Module }: let list = import ./data.nix; @@ -16,7 +17,7 @@ let inherit owner repo sha256; rev = "v${version}"; }; - + # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. @@ -24,7 +25,12 @@ let }; in { - elasticsearch = callPackage ./elasticsearch {}; + elasticsearch = callPackage ./elasticsearch { + # Version 0.7.0 fails to build with go 1.13 due to dependencies: + # verifying git.apache.org/thrift.git@v0.12.0/go.mod: git.apache.org/thrift.git@v0.12.0/go.mod: Get https://sum.golang.org/lookup/git.apache.org/thrift.git@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused + # verifying github.com/hashicorp/terraform@v0.12.0/go.mod: github.com/hashicorp/terraform@v0.12.0/go.mod: Get https://sum.golang.org/lookup/github.com/hashicorp/terraform@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused + buildGoModule = buildGo112Module; + }; gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; libvirt = callPackage ./libvirt {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4beb5a92d7f..d5377f2020b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24607,7 +24607,9 @@ in terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers {} + callPackage ../applications/networking/cluster/terraform-providers { + inherit buildGo112Module; + } ); terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; From e45055c3289c9bf7c5c4e00066e88ac8871f1f67 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 17 Sep 2019 00:48:30 +0200 Subject: [PATCH 19/31] all-packages: use go 1.12 for prow --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5377f2020b..17226d2c0bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24593,7 +24593,11 @@ in jx = callPackage ../applications/networking/cluster/jx {}; - prow = callPackage ../applications/networking/cluster/prow {}; + prow = callPackage ../applications/networking/cluster/prow { + # Version 2019-08-14 fails to build with go 1.13 due to dependencies: + # go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint) + buildGoModule = buildGo112Module; + }; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_11 From eec1a1345f94b2a512dbe666729b090e60eddc2f Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 18 Sep 2019 23:28:57 +0200 Subject: [PATCH 20/31] all-packages: use go 1.12 for cockroachdb --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17226d2c0bb..5f4f7dc34ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15561,7 +15561,9 @@ in cpustat = callPackage ../os-specific/linux/cpustat { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { + buildGoPackage = buildGo112Package; + }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; From 6e031f1244ec5b32ae90ee8a240fd37741200817 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Tue, 17 Sep 2019 22:53:59 -0400 Subject: [PATCH 21/31] all-packages: use go 1.12 for grafana --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f4f7dc34ad..622a3d06112 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14766,7 +14766,9 @@ in gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { }; + grafana = callPackage ../servers/monitoring/grafana { + buildGoPackage = buildGo112Package; + }; grafana-loki = callPackage ../servers/monitoring/loki { }; From 7c6e98721c7551298b80a4751ccb614c81eea50c Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Tue, 17 Sep 2019 22:58:26 -0400 Subject: [PATCH 22/31] all-packages: use go 1.12 for magnetico Co-authored-by: Roman Volosatovs --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 622a3d06112..2bc8c94c779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19497,7 +19497,10 @@ in marp = callPackage ../applications/office/marp { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { }; + magnetico = callPackage ../applications/networking/p2p/magnetico { + # Version 2019-08-14 fails to build with go 1.13 due to missing go.sum + buildGoModule = buildGo112Module; + }; matchbox = callPackage ../applications/window-managers/matchbox { }; From 057b547fd4e73af8398d282f0b137dccb26cd4f1 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Tue, 17 Sep 2019 23:00:27 -0400 Subject: [PATCH 23/31] all-packages: use go 1.12 for openshift --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bc8c94c779..e8a1d70cd9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19780,7 +19780,9 @@ in notion = callPackage ../applications/window-managers/notion { }; - openshift = callPackage ../applications/networking/cluster/openshift { }; + openshift = callPackage ../applications/networking/cluster/openshift { + buildGoPackage = buildGo112Package; + }; oroborus = callPackage ../applications/window-managers/oroborus {}; From e9a9b553e7a827ee71b3478280cb0b4731b905e2 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Tue, 17 Sep 2019 23:43:25 -0400 Subject: [PATCH 24/31] all-packages: use go 1.12 for kubernetes --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8a1d70cd9a..1381ee9ecac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19265,7 +19265,9 @@ in kubeval = callPackage ../applications/networking/cluster/kubeval { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { + go = buildPackages.go_1_12; + }; kubectl = callPackage ../applications/networking/cluster/kubectl { }; From 88ffdabc0e57d743518824a57b89ef2b8a3ee311 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Sep 2019 19:14:48 -0500 Subject: [PATCH 25/31] documize-community: disable go module build --- pkgs/servers/documize-community/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 7339bcc6584..af969c9e929 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { runHook preBuild pushd go/src/github.com/documize/community - go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize ./edition/community.go + GO111MODULE=off go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize ./edition/community.go popd runHook postBuild From fc5026b4ec9e999b6049e2362d9f497cd2eaf9c2 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Fri, 20 Sep 2019 00:14:08 -0400 Subject: [PATCH 26/31] all-packages: use go 1.12 for prometheus and prometheus-varnish-exporter These both fail to work with go1.13 due to test issues, downgrading to 1.12 --- pkgs/top-level/all-packages.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1381ee9ecac..0cf0991f70b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15134,7 +15134,11 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus = callPackage ../servers/monitoring/prometheus { + # Version 2.12.0 fails to build with go 1.13 due to an incorrect module file + # compilation error :go: cloud.google.com/go@v0.44.1: Get https://proxy.golang.org/cloud.google.com/go/@v/v0.44.1.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:58980->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; @@ -15166,7 +15170,11 @@ in prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; - prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; + prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { + # Version 1.5.1 fails to build with go 1.13 due to test failure + # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s + buildGoModule = buildGo112Module; + }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; From d32980ca1edb934e6756770b288806dbda388113 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 25 Sep 2019 22:44:49 -0400 Subject: [PATCH 27/31] all-packages: use go 1.12 for circleci-cli --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cf0991f70b..1924bdf6d1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2243,7 +2243,11 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { + # Version 0.1.5879 fails to build with go 1.13 due to: + # build github.com/CircleCI-Public/circleci-cli: cannot load github.com/gobuffalo/packr/v2: github.com/gobuffalo/packr@v1.21.0: reading file:///nix/store/hh9hrfdg3gbqz37sa3hx44mkzkxpkkyw-circleci-cli-0.1.5879-go-modules/github.com/gobuffalo/packr/@v/v1.21.0.zip: Not Found + buildGoModule = buildGo112Module; + }; # Cleanup before 20.03: citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace."; From 52d057f575456660f6f8e83a9d5eef6e46091e74 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 25 Sep 2019 22:49:13 -0400 Subject: [PATCH 28/31] all-packages: use go 1.12 for git-lfs --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1924bdf6d1f..a995a1306cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3390,7 +3390,11 @@ in git-crecord = callPackage ../applications/version-management/git-crecord { }; - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); + git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { + # Version 2.8.0 fails with go1.13 + # go: github.com/alexbrainman/sspi@v0.0.0-20180125232955-4729b3d4d858: Get https://proxy.golang.org/github.com/alexbrainman/sspi/@v/v0.0.0-20180125232955-4729b3d4d858.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:32932->[::1]:53: read: connection refused + buildGoPackage = buildGo112Package; + }); git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { }; From f93ea5abe1d23f6f12661333f510201fb48b533e Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sat, 5 Oct 2019 10:36:53 +0200 Subject: [PATCH 29/31] go_1_13: add kalbasit to maintainers --- pkgs/development/compilers/go/1.13.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 2ff10d528d8..d0aeac13522 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -233,7 +233,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ]; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; } From 88f65fca79f806042e54908a0a71b085c2d5c135 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 18 Sep 2019 23:59:36 +0200 Subject: [PATCH 30/31] conftest: 0.12.0 -> 0.14.0, disable go sum db. The go sum db is a hosted service that appears to be generating a new inclusion proof each time this build is run (rather than using the one from the previous run). Since this ends up the module directory + thus hash, it's breaking deterministic builds. Co-authored-by: Roman Volosatovs --- pkgs/development/tools/conftest/default.nix | 21 ++-- .../tools/conftest/go-1.13-deps.patch | 99 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 14 insertions(+), 108 deletions(-) delete mode 100644 pkgs/development/tools/conftest/go-1.13-deps.patch diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 4c8792cc6aa..a4a6a7998b0 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,27 +2,32 @@ buildGoModule rec { pname = "conftest"; - version = "0.12.0"; + 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"; rev = "v${version}"; - sha256 = "0blrbbnvnnxyw0idhglqdz16i7g6g86a6kw2iw707bg0yfdl1ncq"; + sha256 = "0fjz6ad8rnznlp1kiyb3c6anhjs6v6acgziw4hmyz0xva4jnspsh"; }; - patches = [ - # Version 0.12.0 does not build with go 1.13. See https://github.com/instrumenta/conftest/pull/85. - # TODO: Remove once https://github.com/instrumenta/conftest/pull/85 is merged and lands in a release. - ./go-1.13-deps.patch - ]; + modSha256 = "1xwqlqx5794hsi14h5gqg69gjcqcma24ha0fxn0vffqgqs2cz1d1"; buildFlagsArray = '' -ldflags= -X main.version=${version} ''; - modSha256 = "11999ywy73ng45gl1qypky8342jvishcp11bdxbigvqhwl2zbpav"; + subPackages = [ "cmd" ]; meta = with lib; { description = "Write tests against structured configuration data"; diff --git a/pkgs/development/tools/conftest/go-1.13-deps.patch b/pkgs/development/tools/conftest/go-1.13-deps.patch deleted file mode 100644 index d03d4ed742a..00000000000 --- a/pkgs/development/tools/conftest/go-1.13-deps.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/go.mod b/go.mod -index a552a6b..a39703d 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/instrumenta/conftest - --go 1.12 -+go 1.13 - - require ( - cloud.google.com/go v0.39.0 // indirect -@@ -43,12 +43,16 @@ require ( - golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect - golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0 // indirect - golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09 // indirect -+ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect - google.golang.org/appengine v1.6.0 // indirect - google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601 // indirect - ) - - replace ( -+ git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 - github.com/containerd/containerd => github.com/containerd/containerd v1.2.6 - github.com/docker/docker => github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd - github.com/golang/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422 -+ github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e => github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e -+ golang.org/x/crypto v0.0.0-20190129210102-0709b304e793 => golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 - ) -diff --git a/go.sum b/go.sum -index 2441c4e..212ac69 100644 ---- a/go.sum -+++ b/go.sum -@@ -10,7 +10,6 @@ dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl - dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= - dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= - dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= --git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= - github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= - github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= - github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -@@ -43,6 +42,7 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU - github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= - github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod h1:LzD22aAzDP8/dyiCKFp31He4m2GPjl0AFyzDtZzUu9M= - github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -+github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= - github.com/apparentlymart/go-cidr v1.0.0 h1:lGDvXx8Lv9QHjrAVP7jyzleG4F9+FkRhJcEsDFxeb8w= - github.com/apparentlymart/go-cidr v1.0.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= - github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= -@@ -132,13 +132,8 @@ github.com/docker/cli v0.0.0-20190511004558-53fc257292ad/go.mod h1:JLrzqnKDaYBop - github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= - github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= - github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= --github.com/docker/docker v0.0.0-20180531152204-71cd53e4a197/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= - github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd h1:h98Vus5/NAC3I4k243/B/KgCdpjCUK4lfxNEw2p/HAc= - github.com/docker/docker v0.0.0-20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= --github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd h1:adRHD5aU4yFK0L4yZwjY3SyWapVmPdq1h19eJdgYUfs= --github.com/docker/docker v1.14.0-0.20190131205458-8a43b7bb99cd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= --github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c h1:rZ+3jNsgjvYgdZ0Nrd4Udrv8rneDbWBohAPuXsTsvGU= --github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= - github.com/docker/docker-credential-helpers v0.6.0/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= - github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= - github.com/docker/docker-credential-helpers v0.6.2 h1:CrW9H1VMf3a4GrtyAi7IUJjkJVpwBBpX0+mvkvYJaus= -@@ -214,6 +209,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg - github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= - github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= - github.com/google/shlex v0.0.0-20150127133951-6f45313302b9/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE= -+github.com/googleapis/gax-go v2.0.0+incompatible h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU= - github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= - github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= - github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc= -@@ -407,8 +403,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM - github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= - github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= - github.com/opencontainers/runc v1.0.0-rc6/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= --github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e h1:+uPGJuuDl61O9GKN/rLHkUCf597mpxmJI06RqMQX81A= --github.com/opencontainers/runc v1.0.1-0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -+github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e h1:9wcty7nGPPNkY8/VsiZkjmMB8x7SydrklJE+vCr4uDg= -+github.com/opencontainers/runc v1.0.0-rc6.0.20190307181833-2b18fe1d885e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= - github.com/opencontainers/runtime-spec v0.0.0-20180909173843-eba862dc2470/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= - github.com/opentracing-contrib/go-stdlib v0.0.0-20171029140428-b1a47cfbdd75/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= - github.com/opentracing/opentracing-go v0.0.0-20171003133519-1361b9cd60be/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -@@ -587,7 +583,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf - golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= --golang.org/x/crypto v0.0.0-20190129210102-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190129210102-ccddf3741a0c/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -@@ -679,6 +674,8 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262 h1:qsl9y/CJx34tuA7QCPNp86J - golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= - golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg= - golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= -+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= - google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= - google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a995a1306cf..954d450bad4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -159,7 +159,7 @@ in cm256cc = callPackage ../development/libraries/cm256cc { }; - conftest = callPackage ../development/tools/conftest {}; + conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; From 8ff186585574067b8a316aaace041167e6d07fb0 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Thu, 10 Oct 2019 21:39:28 -0400 Subject: [PATCH 31/31] gcsfuse: add go.mod and go.sum files. It looks like go1.12 silently created the module, but go1.13 does not. --- pkgs/tools/filesystems/gcsfuse/default.nix | 5 +++ pkgs/tools/filesystems/gcsfuse/go.mod.patch | 28 +++++++++++++++ pkgs/tools/filesystems/gcsfuse/go.sum.patch | 38 +++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 pkgs/tools/filesystems/gcsfuse/go.mod.patch create mode 100644 pkgs/tools/filesystems/gcsfuse/go.sum.patch diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 8ce87375b26..af3e9250985 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -13,6 +13,11 @@ buildGoModule rec { modSha256 = "0i86xs3lq2mj22yv7jmhmb34k7lz348bakqz020xpyccllkkszy4"; + patches = [ + ./go.mod.patch + ./go.sum.patch + ]; + meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; diff --git a/pkgs/tools/filesystems/gcsfuse/go.mod.patch b/pkgs/tools/filesystems/gcsfuse/go.mod.patch new file mode 100644 index 00000000000..fbda63432d7 --- /dev/null +++ b/pkgs/tools/filesystems/gcsfuse/go.mod.patch @@ -0,0 +1,28 @@ +--- a/go.mod 2019-10-09 22:35:05.777065057 -0400 ++++ b/go.mod 2019-10-10 21:34:15.809681738 -0400 +@@ -0,0 +1,25 @@ ++module github.com/googlecloudplatform/gcsfuse ++ ++go 1.12 ++ ++require ( ++ cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c ++ github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1 ++ github.com/golang/protobuf v0.0.0-20170902000452-17ce1425424a ++ github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f ++ github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa ++ github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308 ++ github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd ++ github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff ++ github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 ++ github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0 ++ github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb ++ github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b ++ github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6 ++ github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e ++ github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 ++ golang.org/x/net v0.0.0-20170809000501-1c05540f6879 ++ golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 ++ google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2 ++ google.golang.org/appengine v0.0.0-20170801183137-c5a90ac045b7 ++) diff --git a/pkgs/tools/filesystems/gcsfuse/go.sum.patch b/pkgs/tools/filesystems/gcsfuse/go.sum.patch new file mode 100644 index 00000000000..d537266e3c1 --- /dev/null +++ b/pkgs/tools/filesystems/gcsfuse/go.sum.patch @@ -0,0 +1,38 @@ +--- a/go.sum 2019-10-09 22:35:05.777065057 -0400 ++++ b/go.sum 2019-10-10 21:34:15.809681738 -0400 +@@ -0,0 +1,35 @@ ++cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c h1:pTb3uxaVLke7AQ/KUVTHWZmzKrKYrip7FimNb3ecAbo= ++cloud.google.com/go v0.0.0-20170807235027-9be7f826df5c/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1 h1:PTPzzngHWcTI0ph/9I92RhVtRkdOCi37wySw/ojR5Eg= ++github.com/codegangsta/cli v0.0.0-20170804093415-b99aa811b4c1/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA= ++github.com/golang/protobuf v0.0.0-20170902000452-17ce1425424a/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f h1:X+tnaqoCcBgAwSTJtoYW6p0qKiuPyMfofEHEFUf2kdU= ++github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f/go.mod h1:Ip4fOwzCrnDVuluHBd7FXIMb7SHOKfkt9/UDrYSZvqI= ++github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa h1:3420E523ahKsI3tlbO0zeLvgzuTFdJoy6JoAVuShs8U= ++github.com/jacobsa/fuse v0.0.0-20170513050233-fe7f3a55dcaa/go.mod h1:9Aml1MG17JVeXrN4D2mtJvYHtHklJH5bESjCKNzVjFU= ++github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308 h1:sfc1gTCrsJQJMySgDstAhwzogqQIrTxkwwScG4p2kbM= ++github.com/jacobsa/gcloud v0.0.0-20180124212516-9291bd1e8308/go.mod h1:3fF6sEraNZSToePaj5q+f9KSaMpuZcwccqAQmOKDv/k= ++github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= ++github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= ++github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= ++github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff/go.mod h1:gJWba/XXGl0UoOmBQKRWCJdHrr3nE0T65t6ioaj3mLI= ++github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11/go.mod h1:+DBdDyfoO2McrOyDemRBq0q9CMEByef7sYl7JH5Q3BI= ++github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0 h1:6GaIakaFrxn738iBykUc6fyS5sIAKRg/wafwzrzRX30= ++github.com/jacobsa/ratelimit v0.0.0-20150904001804-f5e47030f3b0/go.mod h1:5/sdn6lSZE5l3rXMkJGO7Y3MHJImklO43rZx9ouOWYQ= ++github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb h1:uSWBjJdMf47kQlXMwWEfmc864bA1wAC+Kl3ApryuG9Y= ++github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb/go.mod h1:ivcmUvxXWjb27NsPEaiYK7AidlZXS7oQ5PowUS9z3I4= ++github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b h1:HMNP0njxow/ahg3AFKzu8HnyOUSRiVqWXm+i4VefV+Y= ++github.com/jacobsa/syncutil v0.0.0-20150827001642-c39ef5c1aa0b/go.mod h1:mPvulh9VKXvo+yOlrD4VYOOYuLdZJ36wa/5QIrtXvWs= ++github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6 h1:XKHJmHcgU9glxk3eLPiRZT5VFSHJitVTnMj/EgIoXC4= ++github.com/jacobsa/timeutil v0.0.0-20170205232429-577e5acbbcf6/go.mod h1:JEWKD6V8xETMW+DEv+IQVz++f8Cn8O/X0HPeDY3qNis= ++github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e h1:BegecLAVSx5IW1bOImB8Lt6+4yiWP4t+PUeckWYzIeg= ++github.com/jacobsa/util v0.0.0-20150810040848-976a6f4de67e/go.mod h1:q0HiLetNeSPHjs8ddOw9U6xahog8xR7WPp6PhzJ6wmk= ++github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro= ++github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= ++golang.org/x/net v0.0.0-20170809000501-1c05540f6879 h1:0rFa7EaCGdQPmZVbo9F7MNF65b8dyzS6EUnXjs9Cllk= ++golang.org/x/net v0.0.0-20170809000501-1c05540f6879/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 h1:RS+wSrhdVci7CsPwJaMN8exaP3UTuQU0qB34R/E/JD0= ++golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= ++google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2 h1:wF/9eBxkxh3/00HWCFpF3583KFXGapuZ3EVpZIuLd4Q= ++google.golang.org/api v0.0.0-20170807210121-5c4ffd5985e2/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= ++google.golang.org/appengine v0.0.0-20170801183137-c5a90ac045b7/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=