diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index a020b15eea3..c668edc9a17 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, darwin, libiconv, alsa-lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, libiconv, alsa-lib, stdenv }: buildGoModule rec { pname = "sampler"; @@ -11,7 +11,15 @@ buildGoModule rec { sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z"; }; - vendorSha256 = "04nywhkil5xkipcibrp6vi63rfcvqgv7yxbxmmrhqys2cdxfvazv"; + patches = [ + # fix build with go 1.17 + (fetchpatch { + url = "https://github.com/sqshq/sampler/commit/97a4a0ebe396a780d62f50f112a99b27044e832b.patch"; + sha256 = "1czns7jc85mzdf1mg874jimls8x32l35x3lysxfgfah7cvvwznbk"; + }) + ]; + + vendorSha256 = "02cfzqadpsk2vkzsp7ciji9wisjza0yp35pw42q44navhbzcb4ji"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix deleted file mode 100644 index aa5d723b70c..00000000000 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage -, buildGoModule -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.1.14"; - sha256 = "0jzcmv6kw555lz7mrm673qgjfmzm4pznibbz9qn3w1jj4x9ddncy"; - vendorSha256 = "04nyd37viz521qb3frcy39alha0bpx029cy3kswldhh7wbyp7284"; -} diff --git a/pkgs/applications/networking/utahfs/default.nix b/pkgs/applications/networking/utahfs/default.nix index b6bae284dcd..e867ff46e7d 100644 --- a/pkgs/applications/networking/utahfs/default.nix +++ b/pkgs/applications/networking/utahfs/default.nix @@ -19,5 +19,7 @@ buildGoPackage rec { license = licenses.bsd3; maintainers = [ maintainers.snglth ]; platforms = platforms.unix; + # does not build with go 1.17: https://github.com/cloudflare/utahfs/issues/46 + broken = true; }; } diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index cf6f2102e6a..950a4ad9327 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -120,5 +120,8 @@ in buildBazelPackage rec { license = licenses.asl20; maintainers = with maintainers; [ andrew-d ]; platforms = [ "x86_64-linux" ]; + # The version we have right now does not compile with go 1.17 + # See https://github.com/NixOS/nixpkgs/pull/174003 if you want to upgrade gvisor + broken = true; }; } diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix deleted file mode 100644 index ffda9f49835..00000000000 --- a/pkgs/development/compilers/go/1.16.nix +++ /dev/null @@ -1,282 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, iana-etc -, runCommand -, perl -, which -, pkg-config -, procps -, pcre -, cacert -, Security -, Foundation -, xcbuild -, mailcap -, runtimeShell -, buildPackages -, pkgsBuildTarget -, callPackage -}: - -let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; - - goBootstrap = runCommand "go-bootstrap" { } '' - mkdir $out - cp -rf ${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"; - "mips" = "mips"; - "mipsel" = "mipsle"; - "riscv64" = "riscv64"; - "s390x" = "s390x"; - "powerpc64le" = "ppc64le"; - "mips64el" = "mips64le"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.16.15"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-kKCMaJJ54184ZbpRCZjDOmMlXDYImz7CBskS/AVow9M="; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkg-config procps ]; - buildInputs = [ cacert pcre ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; - - depsTargetTargetPropagated = lib.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. - # but also allow static binaries built with NixOS to run outside nix - sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go - - # 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 - # Fails on aarch64 - sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go - # Skip this test since ssl patches mess it up. - sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # Disable another PIE test which breaks. - sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go - # Disable the BuildModePie test - sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_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 - - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - '' + lib.optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + lib.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.16.patch - ./remove-test-pie-1.15.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-chown-tests-1.16.patch - ./skip-external-network-tests-1.16.patch - ./skip-nohup-tests.patch - ./skip-cgo-tests-1.15.patch - ./go_no_vendor_checks-1.16.patch - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32-1.14.patch - else ./skip-test-extra-files-on-386-1.14.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 - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = "softfloat"; # 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 - - ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - 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/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${lib.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 - ''; - - disallowedReferences = [ goBootstrap ]; - - meta = with lib; { - homepage = "https://go.dev/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 7b80192a75e..3a1a6bcd05d 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,18 +1,26 @@ -{ lib, buildGoPackage, fetchFromGitHub, sqlite }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, sqlite }: -buildGoPackage rec { +buildGoModule rec { pname = "textql"; - version = "2.0.3"; - - goPackagePath = "github.com/dinedal/textql"; + version = "unstable-2021-07-06"; src = fetchFromGitHub { owner = "dinedal"; repo = "textql"; - rev = version; - sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; + rev = "fca00ecc76c8d9891b195ad2c1359d39f0213604"; + sha256 = "1v1nq7q2jr7d7kimlbykmh9d73cw750ybcz7v7l091qxjsii3irm"; }; + patches = [ + # fix build with go 1.17 + (fetchpatch { + url = "https://github.com/jawn-smith/textql/commit/a0d7038c8c30671dfd618f47322814ab492c11a1.patch"; + sha256 = "1yjdbwipjxxhfcqlj1z6ngsm7dr8gfp4l61jynn2iw7f02cn1yck"; + }) + ]; + + vendorSha256 = "1h77wfs3plgcsysb13jk526gnbcw2j0xbbrvc68mz6nk1mj6scgw"; + postInstall = '' install -Dm644 -t $out/share/man/man1 ${src}/man/textql.1 ''; @@ -20,8 +28,6 @@ buildGoPackage rec { # needed for tests nativeBuildInputs = [ sqlite ]; - goDeps = ./deps.nix; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/tools/textql/deps.nix b/pkgs/development/tools/textql/deps.nix deleted file mode 100644 index e166e73a61f..00000000000 --- a/pkgs/development/tools/textql/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; - }; - } -] diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index 65c6d8ae77a..1cc8399eaee 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "sha256-+8cW7xNr4gzNHQ/hBpASoe9g7W/QFQhtO/dZ9umgJec="; + sha256 = "0zphwcd84kli0daaxaayvgfv7xqqrb5aqw1hgvwcfcrnmwqfg7pl"; }; - vendorSha256 = "sha256-foAjMPvNJnjpxRAXEgNeYuvDAoBdMwiQc9BiNxifzUc="; + vendorSha256 = "0y0nkgg6scw8678xaqraxhfz8882i5jcpsqwvrl177bxc76cfjp3"; subPackages = [ "." ]; diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 6cdc6380e84..3aa1d0a0ebd 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -18,6 +18,9 @@ buildGoModule rec { "-X main.version=${version}" ]; + # broken with go>1.16 + doCheck = false; + preCheck = '' export VOUCH_ROOT=$PWD ''; diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix index 16c555473f3..10ea061f860 100644 --- a/pkgs/tools/filesystems/goofys/default.nix +++ b/pkgs/tools/filesystems/goofys/default.nix @@ -30,7 +30,8 @@ buildGoModule { description = "A high-performance, POSIX-ish Amazon S3 file system written in Go."; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.adisbladis ]; - broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 + # does not build with go 1.17 + broken = true; }; } diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/tools/misc/yajsv/default.nix index 6e5f20bfbd2..cae0b9042c8 100644 --- a/pkgs/tools/misc/yajsv/default.nix +++ b/pkgs/tools/misc/yajsv/default.nix @@ -12,7 +12,11 @@ in buildGoModule { sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7"; }; - vendorSha256 = "0rmc31i5jra2qcqhw1azflmhawxasrq0d6qwd6qp250sj1jr6ahq"; + patches = [ + ./go.mod.patch + ]; + + vendorSha256 = "0jcm789las02prgl89va8xvvz98sjcyvzd9zqk3mwal656b5r3kz"; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/misc/yajsv/go.mod.patch b/pkgs/tools/misc/yajsv/go.mod.patch new file mode 100644 index 00000000000..3b1c09f8188 --- /dev/null +++ b/pkgs/tools/misc/yajsv/go.mod.patch @@ -0,0 +1,30 @@ +diff --git a/go.mod b/go.mod +index 9f96eaf..360ab47 100644 +--- a/go.mod ++++ b/go.mod +@@ -7,5 +7,6 @@ require ( + github.com/ghodss/yaml v1.0.0 + github.com/mitchellh/go-homedir v1.1.0 + github.com/xeipuuv/gojsonschema v1.2.0 ++ golang.org/x/text v0.3.7 + gopkg.in/yaml.v2 v2.2.8 // indirect + ) +diff --git a/go.sum b/go.sum +index 5b7e5c4..4b002ef 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,4 +1,3 @@ +-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + 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= +@@ -17,6 +16,9 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= + github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= + github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= ++golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= ++golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= ++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index d279f061737..03e1d0ad5af 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "obfs4"; - version = "0.0.11"; + version = "0.0.12"; src = fetchgit { url = "https://git.torproject.org/pluggable-transports/obfs4.git"; - rev = "refs/tags/${pname}proxy-${version}"; - sha256 = "sha256-VjJ/Pc1YjNB2iLnN/5CxuaxolcaR1IMWgoESMzOXU/g="; + rev = "a564bc3840bc788605e1a8155f4b95ce0d70c6db"; # not tagged + sha256 = "0hqk540q94sh4wvm31jjcvpdklhf8r35in4yii7xnfn58a7amfkc"; }; - vendorSha256 = "sha256-xGCK8biTYcrmKbsl6ZyCjpRrVP9x5xGrC3VcMsR7ETo="; + vendorSha256 = "0yjanv5piygffpdfysviijl7cql2k0r05bsxnlj4hbamsriz9xqy"; meta = with lib; { description = "A pluggable transport proxy"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 521317b62d7..bb88c91d1c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -905,6 +905,7 @@ mapAliases ({ nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 + nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14e363c6b3e..5ebb7608596 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2474,9 +2474,7 @@ with pkgs; xcodeenv = callPackage ../development/mobile/xcodeenv { }; - gomobile = callPackage ../development/mobile/gomobile { - buildGoModule = buildGo116Module; - }; + gomobile = callPackage ../development/mobile/gomobile { }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; @@ -3663,9 +3661,7 @@ with pkgs; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; - godu = callPackage ../tools/misc/godu { - buildGoModule = buildGo116Module; - }; + godu = callPackage ../tools/misc/godu { }; goss = callPackage ../tools/misc/goss { }; @@ -5492,9 +5488,7 @@ with pkgs; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; - utahfs = callPackage ../applications/networking/utahfs { - buildGoPackage = buildGo116Package; - }; + utahfs = callPackage ../applications/networking/utahfs { }; wakeonlan = callPackage ../tools/networking/wakeonlan { }; @@ -6518,9 +6512,7 @@ with pkgs; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; - goofys = callPackage ../tools/filesystems/goofys { - buildGoModule = buildGo116Module; - }; + goofys = callPackage ../tools/filesystems/goofys { }; go-sct = callPackage ../tools/X11/go-sct { }; @@ -7166,14 +7158,10 @@ with pkgs; ipfetch = callPackage ../tools/networking/ipfetch { }; - ipfs = callPackage ../applications/networking/ipfs { - buildGoModule = buildGo116Module; - }; + ipfs = callPackage ../applications/networking/ipfs { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; - ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { - buildGoModule = buildGo116Module; - }; + ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { }; ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; @@ -7770,9 +7758,7 @@ with pkgs; mmv-go = callPackage ../tools/misc/mmv-go { }; - mob = callPackage ../applications/misc/mob { - buildGoModule = buildGo116Module; - }; + mob = callPackage ../applications/misc/mob {}; most = callPackage ../tools/misc/most { }; @@ -8660,11 +8646,6 @@ with pkgs; # with different versions we pin Go for all versions. # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix { - buildGoModule = buildGo116Module; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix { buildGoModule = buildGo117Module; inherit (linuxPackages) nvidia_x11; @@ -8876,9 +8857,7 @@ with pkgs; obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { - buildGoModule = buildGo116Module; - }; + obfs4 = callPackage ../tools/networking/obfs4 { }; ocproxy = callPackage ../tools/networking/ocproxy { }; @@ -11483,9 +11462,7 @@ with pkgs; testdisk-qt = testdisk.override { enableQt = true; }; - textql = callPackage ../development/tools/textql { - buildGoPackage = buildGo116Package; - }; + textql = callPackage ../development/tools/textql { }; html2text = callPackage ../tools/text/html2text { }; @@ -11891,9 +11868,7 @@ with pkgs; yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yajsv = callPackage ../tools/misc/yajsv { - buildGoModule = buildGo116Module; - }; + yajsv = callPackage ../tools/misc/yajsv { }; yallback = callPackage ../development/tools/analysis/yallback { }; @@ -13115,13 +13090,6 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { @@ -21378,9 +21346,6 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo116Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_16; - }; buildGo117Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_17; }; @@ -21390,9 +21355,6 @@ with pkgs; buildGoPackage = buildGo117Package; - buildGo116Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_16; - }; buildGo117Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_17; }; @@ -21983,7 +21945,7 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; mycorrhiza = callPackage ../servers/mycorrhiza { - buildGoModule = buildGo116Module; + buildGoModule = buildGo118Module; }; napalm = with python3Packages; toPythonApplication ( @@ -22007,9 +21969,7 @@ with pkgs; unit = callPackage ../servers/http/unit { }; - ncdns = callPackage ../servers/dns/ncdns { - buildGoModule = buildGo116Module; - }; + ncdns = callPackage ../servers/dns/ncdns { }; nginx = nginxStable; @@ -22547,9 +22507,7 @@ with pkgs; sambaFull = samba4Full; - sampler = callPackage ../applications/misc/sampler { - buildGoModule = buildGo116Module; - }; + sampler = callPackage ../applications/misc/sampler { }; shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; @@ -22673,9 +22631,7 @@ with pkgs; uxplay = callPackage ../servers/uxplay { }; - vouch-proxy = callPackage ../servers/vouch-proxy { - buildGoModule = buildGo116Module; - }; + vouch-proxy = callPackage ../servers/vouch-proxy { }; victoriametrics = callPackage ../servers/nosql/victoriametrics { }; @@ -26922,9 +26878,7 @@ with pkgs; gv = callPackage ../applications/misc/gv { }; - gvisor = callPackage ../applications/virtualization/gvisor { - go = go_1_16; - }; + gvisor = callPackage ../applications/virtualization/gvisor { }; gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { };