tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 03:51:53 +02:00
Code Activity

gnu: go-1.22: Inherit from go-1.20.

Browse Source 
* gnu/packages/golang.scm (go-1.22)[inherit]: Inherit from go-1.20.
[arguments]: Add phases previously inherited from 1.21.

Change-Id: Ic8e2f921a9889b5cb270eb43e98fbbddde3e8249
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit is contained in:
Efraim Flashner
2025-08-22 20:01:30 +03:00
committed by Sharlatan Hellseher
parent 14e760b1db
commit 48e6bbe129
1 changed files with 126 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnu/packages/golang.scm
+126 -3
View File
@@ -866,7 +866,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(define-public go-1.22
(package
(inherit go-1.21)
(inherit go-1.20)
(name "go")
(version "1.22.12")
(source
@@ -879,13 +879,136 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(sha256
(base32 "0f0fr92z3l3szmxf3wvh20w1sqayvd927gawdp5d44cc44pd6c0n"))))
(arguments
(substitute-keyword-arguments (package-arguments go-1.21)
(substitute-keyword-arguments (package-arguments go-1.20)
((#:parallel-tests? _ #t)
(or (not (target-riscv64?))
(not (target-arm32?))))
((#:phases phases)
#~(modify-phases #$phases
(add-after 'disable-failing-tests 'disable-more-tests
;; Source patching phases are broken up into discrete steps to allow
;; future versions to discard individual phases without having to
;; discard all source patching.
(delete 'skip-TestGoPathShlibGccgo-tests)
(delete 'patch-source)
(add-after 'unpack 'patch-os-tests
(lambda _
(substitute* "src/os/os_test.go"
(("/usr/bin") (getcwd))
(("/bin/sh") (which "sh")))))
(add-after 'unpack 'apply-patches
(lambda* (#:key inputs #:allow-other-keys)
;; 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" "-p1" "--force" "-i"
(assoc-ref inputs "go-fix-script-tests.patch"))))
(add-after 'unpack 'patch-src/net
(lambda* (#:key inputs #:allow-other-keys)
(let ((net-base (assoc-ref inputs "net-base")))
(substitute* "src/net/lookup_unix.go"
(("/etc/protocols")
(string-append net-base "/etc/protocols")))
(substitute* "src/net/port_unix.go"
(("/etc/services")
(string-append net-base "/etc/services"))))))
(add-after 'unpack 'patch-zoneinfo
(lambda* (#:key inputs #:allow-other-keys)
;; Add the path to this specific version of tzdata's zoneinfo
;; file to the top of the list to search. We don't want to
;; replace any sources because it will affect how binaries
;; compiled with this Go toolchain behave on non-guix
;; platforms.
(substitute* "src/time/zoneinfo_unix.go"
(("var platformZoneSources.+" all)
(format #f "~a~%\"~a/share/zoneinfo\",~%"
all
(assoc-ref inputs "tzdata"))))))
(add-after 'unpack 'patch-cmd/go/testdata/script
(lambda _
(substitute* "src/cmd/go/testdata/script/cgo_path_space.txt"
(("/bin/sh") (which "sh")))))
(add-after 'unpack 'remove-failing-test
(lambda _
;; This test fails with newer gcc's
;; https://github.com/golang/go/issues/57691
(substitute* "src/cmd/cgo/internal/testsanitizers/asan_test.go"
((".*arena_fail.*") ""))))
(add-after 'enable-external-linking 'enable-external-linking-1.21
(lambda _
;; Invoke GCC to link any archives created with GCC (that is,
;; any packages built using 'cgo'), because Go doesn't know
;; how to handle the runpaths but GCC does. Use substitute*
;; rather than a patch since these files are liable to change
;; often.
;;
;; XXX: Replace with GO_EXTLINK_ENABLED=1 or similar when
;; <https://github.com/golang/go/issues/31544> and/or
;; <https://github.com/golang/go/issues/43525> are resolved.
(substitute* "src/cmd/link/internal/ld/config.go"
(("\\(iscgo && \\(.+\\)") "iscgo"))
(substitute* "src/internal/testenv/testenv.go"
(("!CanInternalLink.+") "true {\n"))
(substitute* "src/syscall/exec_linux_test.go"
(("testenv.MustHaveExecPath\\(t, \"whoami\"\\)")
"t.Skipf(\"no passwd file present\")"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
;; Notably, we do not install archives (180M), which Go will
;; happily recompile quickly (and cache) if needed, almost
;; surely faster than they could be substituted.
;;
;; The main motivation for pre-compiled archives is to use
;; libc-linked `net' or `os' packages without a C compiler,
;; but on Guix a C compiler is necessary to properly link the
;; final binaries anyway. Many build flags also invalidate
;; these pre-compiled archives, so in practice Go often
;; recompiles them anyway.
;;
;; Upstream is also planning to no longer install these
;; archives: <https://github.com/golang/go/issues/47257>.
;;
;; When necessary, a custom pre-compiled library package can
;; be created with `#:import-path "std"' and used with
;; `-pkgdir'.
;;
;; When moving files into place, any files that come from
;; GOROOT should remain in GOROOT to continue functioning. If
;; they need to be referenced from some other directory, they
;; need to be symlinked from GOROOT. For more information,
;; please see <https://github.com/golang/go/issues/61921>.
(let* ((out (assoc-ref outputs "out"))
(tests (assoc-ref outputs "tests")))
(for-each
(lambda (file)
(copy-recursively file (string-append out "/lib/go/" file)))
'("bin" "go.env" "lib" "VERSION" "pkg/include" "pkg/tool"))
(symlink "lib/go/bin" (string-append out "/bin"))
(for-each
(match-lambda
((file dest output)
;; Copy to output/dest and symlink from
;; output/lib/go/file.
(let ((file* (string-append output "/lib/go/" file))
(dest* (string-append output "/" dest)))
(copy-recursively file dest*)
(mkdir-p (dirname file*))
(symlink (string-append "../../" dest) file*))))
`(("src" "share/go/src" ,out)
("misc" "share/go/misc" ,out)
("doc" "share/doc/go/doc" ,out)
("api" "share/go/api" ,tests)
("test" "share/go/test" ,tests))))))
(replace 'disable-more-tests
(lambda _
#$@(cond
((target-aarch64?)