Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8b57a7573c04
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1658beb6a13c
Choose a head ref

Commits on Oct 11, 2019

  1. go_1_13: init at 1.13.1

    rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    bd02320 View commit details
  2. go: default to go_1_13

    rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    bdd5033 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    4ef3de8 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    ea0b765 View commit details
  5. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    2d7e8e1 View commit details
  6. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    9e5f063 View commit details
  7. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    01721f1 View commit details
  8. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    2f20deb View commit details
  9. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    db6cb37 View commit details
  10. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    ee2c8ec View commit details
  11. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    745b299 View commit details
  12. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    7ddd2a2 View commit details
  13. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    72a6ab4 View commit details
  14. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    b63b95f View commit details
  15. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    a3341e8 View commit details
  16. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    cf6e277 View commit details
  17. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    fcdc280 View commit details
  18. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    8c33df9 View commit details
  19. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    e45055c View commit details
  20. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    eec1a13 View commit details
  21. all-packages: use go 1.12 for grafana

    c00w authored and rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    6e031f1 View commit details
  22. all-packages: use go 1.12 for magnetico

    Co-authored-by: Roman Volosatovs <rvolosatovs@riseup.net>
    c00w and rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    7c6e987 View commit details
  23. all-packages: use go 1.12 for openshift

    c00w authored and rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    057b547 View commit details
  24. all-packages: use go 1.12 for kubernetes

    c00w authored and rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    e9a9b55 View commit details
  25. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    88ffdab View commit details
  26. 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
    c00w authored and rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    fc5026b View commit details
  27. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    d32980c View commit details
  28. all-packages: use go 1.12 for git-lfs

    c00w authored and rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    52d057f View commit details
  29. Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    f93ea5a View commit details
  30. 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 <rvolosatovs@riseup.net>
    c00w and rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    88f65fc View commit details
  31. gcsfuse: add go.mod and go.sum files.

    It looks like go1.12 silently created the module, but go1.13 does not.
    c00w authored and rvolosatovs committed Oct 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rvolosatovs Roman Volosatovs
    Copy the full SHA
    8ff1865 View commit details
  32. utsushi: 3.57.0 -> 3.59.2

    + building from gitlab source
    + reorderd dependencies to be in logical/alphabetical order
    + replaced patches with substituteInPlace, as patches broke the installChecks
      and substituteInPlace may be more robust than making new patches for each
      release. Also the compiled source is now closer to upstream than
      before.
    + added installChecks
    + added all supported devices as listed on epson.net
    wucke13 committed Oct 11, 2019
    Copy the full SHA
    9eb00ac View commit details

Commits on Oct 12, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    62e894b View commit details
  2. Merge pull request #70160 from wucke13/utsushi

    utsushi: 3.57.0 -> 3.59.2
    grahamc authored Oct 12, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9c19b7b View commit details
  3. cargo-bloat: 0.8.3 -> 0.9.0

    xrelkd authored and Jon committed Oct 12, 2019
    Copy the full SHA
    1658beb View commit details
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, buildGoPackage
, fetchFromGitHub
, callPackage
, buildGo112Module
}:
let
list = import ./data.nix;
@@ -16,15 +17,20 @@ 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.
postBuild = "mv go/bin/${repo}{,_v${version}}";
};
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 {};
239 changes: 239 additions & 0 deletions pkgs/development/compilers/go/1.13.nix
Original file line number Diff line number Diff line change
@@ -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 kalbasit ];
platforms = platforms.linux ++ platforms.darwin;
};
}
34 changes: 34 additions & 0 deletions pkgs/development/compilers/go/remove-test-pie-1.13.patch
Original file line number Diff line number Diff line change
@@ -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{
64 changes: 64 additions & 0 deletions pkgs/development/compilers/go/ssl-cert-file-1.13.patch
Original file line number Diff line number Diff line change
@@ -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 != "" {
Loading