From: Sarah Morgensen <iskarian@mgsn.dev>
To: 50348@debbugs.gnu.org
Subject: [bug#50348] [PATCH v2] gnu: Add go-1.17.
Date: Thu, 9 Sep 2021 12:45:42 -0700 [thread overview]
Message-ID: <a356114a0e72d556b01f9e395dbbb3386545b3d7.1631216470.git.iskarian@mgsn.dev> (raw)
In-Reply-To: <b64abcbc5c9a05e43be860ae31de8aa3c6556942.1630620331.git.iskarian@mgsn.dev>
* gnu/packages.golang.scm (go-1.17): New variable.
---
Rebased on current master and updated to use Go 1.17.1.
gnu/packages/golang.scm | 182 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 182 insertions(+)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b6e8b84749..95cff83e9e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -608,6 +608,188 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(alist-replace "go" (list gccgo-10) (package-native-inputs go-1.14))
(package-native-inputs go-1.14))))))
+(define-public go-1.17
+ (package
+ (inherit go-1.16)
+ (name "go")
+ (version "1.17.1")
+ (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
+ "0wk99lwpzp4qwrksl932lm9vb70nyf4vgb5lxwh7gzjcbhlqj992"))))
+ (outputs '("out" "tests")) ; 'tests' contains distribution tests.
+ (arguments
+ `(#:modules ((ice-9 match)
+ (guix build gnu-build-system)
+ (guix build utils))
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((output (assoc-ref outputs "out"))
+ (loader (string-append (assoc-ref inputs "libc")
+ ,(glibc-dynamic-linker))))
+ (setenv "GOOS" "linux")
+ (setenv "GO_LDSO" loader)
+ (setenv "GOROOT" (getcwd))
+ (setenv "GOROOT_FINAL" (string-append output "/lib/go"))
+ (setenv "GOGC" "400")
+ (setenv "GOCACHE" "/tmp/go-cache"))))
+ (add-after 'unpack 'patch-source
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((net-base (assoc-ref inputs "net-base"))
+ (tzdata-path (string-append (assoc-ref inputs "tzdata")
+ "/share/zoneinfo")))
+ ;; XXX: Remove when #49729 is merged?
+ (for-each make-file-writable (find-files "src"))
+
+ ;; 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-skip-gc-test.patch"))
+ (invoke "patch" "-p1" "--force" "-i"
+ (assoc-ref inputs "go-fix-script-tests.patch"))
+
+ (substitute* "src/os/os_test.go"
+ (("/usr/bin") (getcwd))
+ (("/bin/sh") (which "sh")))
+
+ (substitute* "src/cmd/go/testdata/script/cgo_path_space.txt"
+ (("/bin/sh") (which "sh")))
+
+ ;; fix shebang for testar script
+ ;; note the target script is generated at build time.
+ (substitute* "misc/cgo/testcarchive/carchive_test.go"
+ (("/usr/bin/env bash") (which "bash")))
+
+ (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")))
+ (substitute* "src/time/zoneinfo_unix.go"
+ (("/usr/share/zoneinfo/") tzdata-path)))))
+ (add-after 'patch-source 'disable-failing-tests
+ (lambda _
+ ;; 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 test)
+ (let ((regex (string-append "^(func\\s+)(" test "\\()")))
+ (substitute* file
+ ((regex all before test_name)
+ (string-append before "Disabled" test_name))))))
+ '(("src/net/cgo_unix_test.go" "TestCgoLookupPort")
+ ("src/net/cgo_unix_test.go" "TestCgoLookupPortWithCancel")
+ ;; 127.0.0.1 doesn't exist
+ ("src/net/cgo_unix_test.go" "TestCgoLookupPTR")
+ ("src/net/cgo_unix_test.go" "TestCgoLookupPTRWithCancel")
+ ;; /etc/services doesn't exist
+ ("src/net/parse_test.go" "TestReadLine")
+ ;; The user's directory doesn't exist
+ ("src/os/os_test.go" "TestUserHomeDir")))
+
+ ;; These tests fail on aarch64-linux
+ (substitute* "src/cmd/dist/test.go"
+ (("t.registerHostTest\\(\"testsanitizers/msan.*") ""))))
+ (add-after 'patch-source 'enable-external-linking
+ (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 && externalobj") "iscgo"))
+ (substitute* '("src/cmd/nm/nm_cgo_test.go"
+ "src/cmd/dist/test.go")
+ (("^func.*?nternalLink\\(\\).*" all)
+ (string-append all "\n\treturn false\n")))))
+ (replace 'build
+ (lambda* (#:key (parallel-build? #t) #:allow-other-keys)
+ (let* ((njobs (if parallel-build? (parallel-job-count) 1)))
+ (with-directory-excursion "src"
+ (setenv "GOMAXPROCS" (number->string njobs))
+ (invoke "sh" "make.bash" "--no-banner")))))
+ (replace 'check
+ (lambda* (#:key target (tests? (not target)) (parallel-tests? #t)
+ #:allow-other-keys)
+ (let* ((njobs (if parallel-tests? (parallel-job-count) 1)))
+ (when tests?
+ (with-directory-excursion "src"
+ (setenv "GOMAXPROCS" (number->string njobs))
+ (invoke "sh" "run.bash" "--no-rebuild"))))))
+ (add-before 'install 'unpatch-perl-shebangs
+ (lambda _
+ ;; Avoid inclusion of perl in closure by rewriting references
+ ;; to perl input in sourcecode generators and test scripts
+ (substitute* (cons "src/net/http/cgi/testdata/test.cgi"
+ (find-files "src" "\\.pl$"))
+ (("^#!.*") "#!/usr/bin/env perl\n"))))
+ (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'.
+ (let* ((out (assoc-ref outputs "out"))
+ (tests (assoc-ref outputs "tests")))
+ (for-each
+ (lambda (file)
+ (copy-recursively file (string-append out "/lib/go/" file)))
+ '("lib" "VERSION" "pkg/include" "pkg/tool"))
+
+ (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*))))
+ `(("bin" "bin" ,out)
+ ("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))))))
+ (add-after 'install 'install-doc-files
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (for-each
+ (lambda (file)
+ (install-file file (string-append out "/share/doc/go")))
+ '("AUTHORS" "CONTRIBUTORS" "CONTRIBUTING.md" "PATENTS"
+ "README.md" "SECURITY.md"))))))))
+ (inputs (alist-delete "gcc:lib" (package-inputs go-1.16)))))
+
(define-public go go-1.14)
(define-public go-0xacab-org-leap-shapeshifter
base-commit: bae57cc7d2917c4a67e9afb68ed61ad7117ea7ea
--
2.33.0
next prev parent reply other threads:[~2021-09-09 19:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-02 22:09 [bug#50348] [PATCH] gnu: Add go-1.17 Sarah Morgensen
2021-09-09 19:45 ` Sarah Morgensen [this message]
2021-09-09 20:50 ` [bug#50348] [PATCH v2] " Leo Famulari
2021-09-09 20:55 ` bug#50348: " Leo Famulari
2021-09-09 20:27 ` [bug#50348] [PATCH] " Leo Famulari
2021-09-09 21:36 ` Sarah Morgensen
2021-09-09 20:53 ` Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a356114a0e72d556b01f9e395dbbb3386545b3d7.1631216470.git.iskarian@mgsn.dev \
--to=iskarian@mgsn.dev \
--cc=50348@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.