Vladimír Čunát 985d1ac425 Merge branch 'master' into staging-next ... There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611		2019-08-25 14:57:11 +02:00
..
1.4.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
1.10.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
1.11.nix	go: 1.11.12 -> 1.11.13	2019-08-24 22:38:57 +02:00
1.12.nix	go: 1.12.7 -> 1.12.9	2019-08-24 22:39:02 +02:00
creds-test-1.4.patch
creds-test.patch
go-1.9-skip-flaky-19608.patch
go-1.9-skip-flaky-20072.patch
remove-fhs-test-references.patch
remove-test-pie.patch
remove-tools-1.4.patch
remove-tools-1.9.patch
remove-tools-1.11.patch
setup-hook.sh
skip-external-network-tests.patch
skip-nohup-tests.patch
skip-test-extra-files-on-386.patch	go: skip flaky os/exec TestExtraFiles	2018-09-15 18:46:18 +02:00
ssl-cert-file-1.9.patch
ssl-cert-file-1.12.1.patch	go_1_12: 1.12 -> 1.12.1	2019-03-21 22:33:43 -07:00