gnu: Remove go-1.14.
* gnu/packages/golang.scm (go-1.14, go-std-1.14): Remove variables. (go-1.16): Inherit from go-1.4. Change-Id: Ie92019e3aa733a8c6f12dfefbc7b140eb1b76c5c Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>master
Efraim Flashner
Sharlatan Hellseher
parent
bbb1a7b5ed
commit
0fe4e6425e
|
|
@ -267,226 +267,9 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||||
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux"))
|
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux"))
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
(define-public go-1.14
|
|
||||||
(package
|
|
||||||
(inherit go-1.4)
|
|
||||||
(name "go")
|
|
||||||
(version "1.14.15")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/golang/go")
|
|
||||||
(commit (string-append "go" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1crh90qkvhlx23hwsi4wxy3l3h8973lr18135y6h1nnzzwr3n3ps"))))
|
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments (package-arguments go-1.4)
|
|
||||||
((#:system system)
|
|
||||||
(if (string-prefix? "aarch64-linux" (or (%current-system)
|
|
||||||
(%current-target-system)))
|
|
||||||
"aarch64-linux"
|
|
||||||
system))
|
|
||||||
((#:phases phases)
|
|
||||||
`(modify-phases ,phases
|
|
||||||
(replace 'prebuild
|
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
||||||
(let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))
|
|
||||||
(ld (string-append (assoc-ref inputs "libc") "/lib"))
|
|
||||||
(loader (car (append (find-files ld "^ld-linux.+")
|
|
||||||
(find-files ld "^ld(64)?\\.so.+"))))
|
|
||||||
(net-base (assoc-ref inputs "net-base"))
|
|
||||||
(tzdata-path
|
|
||||||
(string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))
|
|
||||||
(output (assoc-ref outputs "out")))
|
|
||||||
|
|
||||||
;; Having the patch in the 'patches' field of <origin> breaks
|
|
||||||
;; the 'TestServeContent' test due to the fact that
|
|
||||||
;; timestamps are reset. Thus, apply it from here.
|
|
||||||
(invoke "patch" "-p2" "--force" "-i"
|
|
||||||
(assoc-ref inputs "go-skip-gc-test.patch"))
|
|
||||||
|
|
||||||
;; A side effect of these test scripts is testing
|
|
||||||
;; cgo. Attempts at using cgo flags and directives with these
|
|
||||||
;; scripts as specified here (https://golang.org/cmd/cgo/)
|
|
||||||
;; have not worked. The tests continue to state that they can
|
|
||||||
;; not find object files/headers despite being present.
|
|
||||||
(for-each
|
|
||||||
delete-file
|
|
||||||
'("cmd/go/testdata/script/mod_case_cgo.txt"
|
|
||||||
"cmd/go/testdata/script/list_find.txt"
|
|
||||||
"cmd/go/testdata/script/list_compiled_imports.txt"
|
|
||||||
"cmd/go/testdata/script/cgo_syso_issue29253.txt"
|
|
||||||
"cmd/go/testdata/script/cover_cgo.txt"
|
|
||||||
"cmd/go/testdata/script/cover_cgo_xtest.txt"
|
|
||||||
"cmd/go/testdata/script/cover_cgo_extra_test.txt"
|
|
||||||
"cmd/go/testdata/script/cover_cgo_extra_file.txt"
|
|
||||||
"cmd/go/testdata/script/cgo_path_space.txt"
|
|
||||||
"cmd/go/testdata/script/ldflag.txt"
|
|
||||||
"cmd/go/testdata/script/cgo_path.txt"))
|
|
||||||
|
|
||||||
(for-each make-file-writable (find-files "."))
|
|
||||||
|
|
||||||
(substitute* "os/os_test.go"
|
|
||||||
(("/usr/bin") (getcwd))
|
|
||||||
(("/bin/pwd") (which "pwd"))
|
|
||||||
(("/bin/sh") (which "sh")))
|
|
||||||
|
|
||||||
;; Backport fix for go-1.14 with GCC 9+
|
|
||||||
;; https://github.com/golang/go/issues/39157
|
|
||||||
(substitute* "cmd/go/note_test.go"
|
|
||||||
(("cannot find 'ld'") "cannot find [‘']ld[’']"))
|
|
||||||
|
|
||||||
;; Add libgcc to runpath
|
|
||||||
(substitute* "cmd/link/internal/ld/lib.go"
|
|
||||||
(("!rpath.set") "true"))
|
|
||||||
(substitute* "cmd/go/internal/work/gccgo.go"
|
|
||||||
(("cgoldflags := \\[\\]string\\{\\}")
|
|
||||||
(string-append "cgoldflags := []string{"
|
|
||||||
"\"-rpath=" gcclib "\""
|
|
||||||
"}"))
|
|
||||||
(("\"-lgcc_s\", ")
|
|
||||||
(string-append
|
|
||||||
"\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", ")))
|
|
||||||
(substitute* "cmd/go/internal/work/gc.go"
|
|
||||||
(("ldflags = setextld\\(ldflags, compiler\\)")
|
|
||||||
(string-append
|
|
||||||
"ldflags = setextld(ldflags, compiler)\n"
|
|
||||||
"ldflags = append(ldflags, \"-r\")\n"
|
|
||||||
"ldflags = append(ldflags, \"" gcclib "\")\n")))
|
|
||||||
|
|
||||||
;; Disable failing tests: these tests attempt to access
|
|
||||||
;; commands or network resources which are neither available
|
|
||||||
;; nor necessary for the build to succeed.
|
|
||||||
(for-each
|
|
||||||
(match-lambda
|
|
||||||
((file regex)
|
|
||||||
(substitute* file
|
|
||||||
((regex all before test_name)
|
|
||||||
(string-append before "Disabled" test_name)))))
|
|
||||||
'(("net/net_test.go" "(.+)(TestShutdownUnix.+)")
|
|
||||||
("net/dial_test.go" "(.+)(TestDialTimeout.+)")
|
|
||||||
("net/cgo_unix_test.go" "(.+)(TestCgoLookupPort.+)")
|
|
||||||
("net/cgo_unix_test.go" "(.+)(TestCgoLookupPortWithCancel.+)")
|
|
||||||
;; 127.0.0.1 doesn't exist
|
|
||||||
("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTR.+)")
|
|
||||||
;; 127.0.0.1 doesn't exist
|
|
||||||
("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTRWithCancel.+)")
|
|
||||||
;; /etc/services doesn't exist
|
|
||||||
("net/parse_test.go" "(.+)(TestReadLine.+)")
|
|
||||||
("os/os_test.go" "(.+)(TestHostname.+)")
|
|
||||||
;; The user's directory doesn't exist
|
|
||||||
("os/os_test.go" "(.+)(TestUserHomeDir.+)")
|
|
||||||
("time/format_test.go" "(.+)(TestParseInSydney.+)")
|
|
||||||
("time/format_test.go" "(.+)(TestParseInLocation.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestEcho.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestCatStdin.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestExitStatus.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestPipes.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestStdinClose.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)")
|
|
||||||
("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)")
|
|
||||||
("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)")
|
|
||||||
("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)")
|
|
||||||
("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)")
|
|
||||||
("net/lookup_test.go" "(.+)(TestLookupPort.+)")
|
|
||||||
("syscall/exec_linux_test.go"
|
|
||||||
"(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)")))
|
|
||||||
|
|
||||||
;; These tests fail on aarch64-linux
|
|
||||||
(substitute* "cmd/dist/test.go"
|
|
||||||
(("t.registerHostTest\\(\"testsanitizers/msan.*") ""))
|
|
||||||
|
|
||||||
;; fix shebang for testar script
|
|
||||||
;; note the target script is generated at build time.
|
|
||||||
(substitute* "../misc/cgo/testcarchive/carchive_test.go"
|
|
||||||
(("#!/usr/bin/env") (string-append "#!" (which "env"))))
|
|
||||||
|
|
||||||
(substitute* "net/lookup_unix.go"
|
|
||||||
(("/etc/protocols") (string-append net-base "/etc/protocols")))
|
|
||||||
(substitute* "net/port_unix.go"
|
|
||||||
(("/etc/services") (string-append net-base "/etc/services")))
|
|
||||||
(substitute* "time/zoneinfo_unix.go"
|
|
||||||
(("/usr/share/zoneinfo/") tzdata-path))
|
|
||||||
(substitute* (find-files "cmd" "\\.go")
|
|
||||||
(("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader))
|
|
||||||
#t)))
|
|
||||||
(add-before 'build 'set-bootstrap-variables
|
|
||||||
(lambda* (#:key outputs inputs #:allow-other-keys)
|
|
||||||
;; Tell the build system where to find the bootstrap Go.
|
|
||||||
(let ((go (assoc-ref inputs "go")))
|
|
||||||
(setenv "GOROOT_BOOTSTRAP" go)
|
|
||||||
(setenv "GOGC" "400")
|
|
||||||
#t)))
|
|
||||||
(replace 'build
|
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
||||||
;; FIXME: Some of the .a files are not bit-reproducible.
|
|
||||||
(let* ((output (assoc-ref outputs "out")))
|
|
||||||
(setenv "CC" (which "gcc"))
|
|
||||||
(setenv "GOOS" "linux")
|
|
||||||
(setenv "GOROOT" (dirname (getcwd)))
|
|
||||||
(setenv "GOROOT_FINAL" output)
|
|
||||||
(setenv "GOCACHE" "/tmp/go-cache")
|
|
||||||
(setenv "CGO_ENABLED" "1")
|
|
||||||
(invoke "sh" "all.bash"))))
|
|
||||||
(replace 'install
|
|
||||||
;; TODO: Most of this could be factorized with Go 1.4.
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(let* ((output (assoc-ref outputs "out"))
|
|
||||||
(doc_out (assoc-ref outputs "doc"))
|
|
||||||
(docs (string-append doc_out "/share/doc/" ,name "-" ,version))
|
|
||||||
(src (string-append
|
|
||||||
(assoc-ref outputs "tests") "/share/" ,name "-" ,version)))
|
|
||||||
;; Prevent installation of the build cache, which contains
|
|
||||||
;; store references to most of the tools used to build Go and
|
|
||||||
;; would unnecessarily increase the size of Go's closure if it
|
|
||||||
;; was installed.
|
|
||||||
(delete-file-recursively "../pkg/obj")
|
|
||||||
|
|
||||||
(mkdir-p src)
|
|
||||||
(copy-recursively "../test" (string-append src "/test"))
|
|
||||||
(delete-file-recursively "../test")
|
|
||||||
(mkdir-p docs)
|
|
||||||
(copy-recursively "../api" (string-append docs "/api"))
|
|
||||||
(delete-file-recursively "../api")
|
|
||||||
(copy-recursively "../doc" (string-append docs "/doc"))
|
|
||||||
(delete-file-recursively "../doc")
|
|
||||||
|
|
||||||
(for-each
|
|
||||||
(lambda (file)
|
|
||||||
(let* ((filein (string-append "../" file))
|
|
||||||
(fileout (string-append docs "/" file)))
|
|
||||||
(copy-file filein fileout)
|
|
||||||
(delete-file filein)))
|
|
||||||
;; Note the slightly different file names compared to 1.4.
|
|
||||||
'("README.md" "CONTRIBUTORS" "AUTHORS" "PATENTS"
|
|
||||||
"LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt"))
|
|
||||||
|
|
||||||
(copy-recursively "../" output)
|
|
||||||
#t)))))))
|
|
||||||
(native-inputs
|
|
||||||
`(,@(if (member (%current-system) (package-supported-systems go-1.4))
|
|
||||||
`(("go" ,go-1.4))
|
|
||||||
`(("go" ,gccgo-12)))
|
|
||||||
("go-skip-gc-test.patch" ,(search-patch "go-skip-gc-test.patch"))
|
|
||||||
,@(match (%current-system)
|
|
||||||
((or "armhf-linux" "aarch64-linux")
|
|
||||||
`(("gold" ,binutils-gold)))
|
|
||||||
(_ `()))
|
|
||||||
,@(package-native-inputs go-1.4)))
|
|
||||||
(supported-systems (fold delete %supported-systems
|
|
||||||
(list "powerpc-linux" "i586-gnu")))))
|
|
||||||
|
|
||||||
(define-public go-1.16
|
(define-public go-1.16
|
||||||
(package
|
(package
|
||||||
(inherit go-1.14)
|
(inherit go-1.4)
|
||||||
(name "go")
|
(name "go")
|
||||||
(version "1.16.15")
|
(version "1.16.15")
|
||||||
(source
|
(source
|
||||||
|
|
@ -501,7 +284,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||||
"0vlk0r4600ah9fg5apdd93g7i369k0rkzcgn7cs8h6qq2k6hpxjl"))))
|
"0vlk0r4600ah9fg5apdd93g7i369k0rkzcgn7cs8h6qq2k6hpxjl"))))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments
|
(substitute-keyword-arguments
|
||||||
(strip-keyword-arguments '(#:tests?) (package-arguments go-1.14))
|
(strip-keyword-arguments '(#:tests? #:system) (package-arguments go-1.4))
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
`(modify-phases ,phases
|
`(modify-phases ,phases
|
||||||
(add-after 'unpack 'remove-unused-sourcecode-generators
|
(add-after 'unpack 'remove-unused-sourcecode-generators
|
||||||
|
|
@ -608,6 +391,12 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||||
(("/etc/services") (string-append net-base "/etc/services")))
|
(("/etc/services") (string-append net-base "/etc/services")))
|
||||||
(substitute* "time/zoneinfo_unix.go"
|
(substitute* "time/zoneinfo_unix.go"
|
||||||
(("/usr/share/zoneinfo/") tzdata-path)))))
|
(("/usr/share/zoneinfo/") tzdata-path)))))
|
||||||
|
(add-before 'build 'set-bootstrap-variables
|
||||||
|
(lambda* (#:key outputs inputs #:allow-other-keys)
|
||||||
|
;; Tell the build system where to find the bootstrap Go.
|
||||||
|
(let ((go (assoc-ref inputs "go")))
|
||||||
|
(setenv "GOROOT_BOOTSTRAP" go)
|
||||||
|
(setenv "GOGC" "400"))))
|
||||||
(replace 'build
|
(replace 'build
|
||||||
(lambda* (#:key inputs outputs (parallel-build? #t)
|
(lambda* (#:key inputs outputs (parallel-build? #t)
|
||||||
#:allow-other-keys)
|
#:allow-other-keys)
|
||||||
|
|
@ -636,10 +425,54 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Rewrite references to perl input in test scripts
|
;; Rewrite references to perl input in test scripts
|
||||||
(substitute* "net/http/cgi/testdata/test.cgi"
|
(substitute* "net/http/cgi/testdata/test.cgi"
|
||||||
(("^#!.*") "#!/usr/bin/env perl\n"))))))))
|
(("^#!.*") "#!/usr/bin/env perl\n"))))
|
||||||
|
(replace 'install
|
||||||
|
;; TODO: Most of this could be factorized with Go 1.4.
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(let* ((output (assoc-ref outputs "out"))
|
||||||
|
(doc_out (assoc-ref outputs "doc"))
|
||||||
|
(docs (string-append doc_out "/share/doc/" ,name "-" ,version))
|
||||||
|
(src (string-append
|
||||||
|
(assoc-ref outputs "tests") "/share/" ,name "-" ,version)))
|
||||||
|
;; Prevent installation of the build cache, which contains
|
||||||
|
;; store references to most of the tools used to build Go and
|
||||||
|
;; would unnecessarily increase the size of Go's closure if it
|
||||||
|
;; was installed.
|
||||||
|
(delete-file-recursively "../pkg/obj")
|
||||||
|
|
||||||
|
(mkdir-p src)
|
||||||
|
(copy-recursively "../test" (string-append src "/test"))
|
||||||
|
(delete-file-recursively "../test")
|
||||||
|
(mkdir-p docs)
|
||||||
|
(copy-recursively "../api" (string-append docs "/api"))
|
||||||
|
(delete-file-recursively "../api")
|
||||||
|
(copy-recursively "../doc" (string-append docs "/doc"))
|
||||||
|
(delete-file-recursively "../doc")
|
||||||
|
|
||||||
|
(for-each
|
||||||
|
(lambda (file)
|
||||||
|
(let* ((filein (string-append "../" file))
|
||||||
|
(fileout (string-append docs "/" file)))
|
||||||
|
(copy-file filein fileout)
|
||||||
|
(delete-file filein)))
|
||||||
|
;; Note the slightly different file names compared to 1.4.
|
||||||
|
'("README.md" "CONTRIBUTORS" "AUTHORS" "PATENTS"
|
||||||
|
"LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt"))
|
||||||
|
|
||||||
|
(copy-recursively "../" output))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch"))
|
`(,@(if (member (%current-system) (package-supported-systems go-1.4))
|
||||||
,@(package-native-inputs go-1.14)))))
|
`(("go" ,go-1.4))
|
||||||
|
`(("go" ,gccgo-12)))
|
||||||
|
("go-skip-gc-test.patch" ,(search-patch "go-skip-gc-test.patch"))
|
||||||
|
,@(match (%current-system)
|
||||||
|
((or "armhf-linux" "aarch64-linux")
|
||||||
|
`(("gold" ,binutils-gold)))
|
||||||
|
(_ `()))
|
||||||
|
("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch"))
|
||||||
|
,@(package-native-inputs go-1.4)))
|
||||||
|
(supported-systems (fold delete %supported-systems
|
||||||
|
(list "powerpc-linux" "i586-gnu")))))
|
||||||
|
|
||||||
;; https://github.com/golang/go/wiki/MinimumRequirements#microarchitecture-support
|
;; https://github.com/golang/go/wiki/MinimumRequirements#microarchitecture-support
|
||||||
(define %go-1.17-arm-micro-architectures
|
(define %go-1.17-arm-micro-architectures
|
||||||
|
|
@ -1183,7 +1016,6 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||||
(export make-go-std)
|
(export make-go-std)
|
||||||
|
|
||||||
;; Make those public so they have a corresponding Cuirass job.
|
;; Make those public so they have a corresponding Cuirass job.
|
||||||
(define-public go-std-1.14 (make-go-std go-1.14))
|
|
||||||
(define-public go-std-1.16 (make-go-std go-1.16))
|
(define-public go-std-1.16 (make-go-std go-1.16))
|
||||||
(define-public go-std-1.17 (make-go-std go-1.17))
|
(define-public go-std-1.17 (make-go-std go-1.17))
|
||||||
(define-public go-std-1.18 (make-go-std go-1.18))
|
(define-public go-std-1.18 (make-go-std go-1.18))
|
||||||
|
|
|
||||||
Reference in New Issue