diff mbox

go@1.4 Updated patch

Message ID 87d1nygoiq.fsf@mailerver.i-did-not-set--mail-host-address--so-tickle-me
State New
Headers show

Commit Message

Matthew Jordan June 3, 2016, 5:39 p.m. UTC
Good Day,

Patch updated as suggested.
Respectfully,

Comments

Andy Wingo June 6, 2016, 8:23 a.m. UTC | #1
Hi :)

Looking good!  I have some style nits :)

On Fri 03 Jun 2016 19:39, Matthew Jordan <matthewjordandevops@yandex.com> writes:

> +               ;; Removing net/ tests
> +               (for-each
> +                (lambda (srcfile)
> +                  (let ((srcfile (string-append "net/" srcfile)))
> +                  (if (file-exists? srcfile)
> +                      (delete-file srcfile))))
> +                '("multicast_test.go" "parse_test.go" "port_test.go"))

Either these files exist or they do not.  Better to just have three
unconditional delete-file invocations.

> +
> +               ;; Add libgcc to runpath
> +               (substitute* "cmd/go/build.go"
> +                 (("cgoldflags := \\[\\]string\\{\\}")
> +                  (string-append "cgoldflags := []string{"
> +                                 "\"-rpath=" gcclib "\""
> +                                 "}"))
> +                 (("ldflags := buildLdflags")
> +                  (string-append
> +                   "ldflags := buildLdflags\n"
> +                   "ldflags = append(ldflags, \"-r\")\n"
> +                   "ldflags = append(ldflags, \"" gcclib "\")\n")))
> +
> +               (substitute* "os/os_test.go"
> +                 (("/usr/bin") (getcwd))
> +                 (("/bin/pwd") (which "pwd")))
> +
> +               ;; Disable failing tests
> +               (for-each
> +                (lambda (srcfile)
> +                  (substitute* (car srcfile)
> +                    (((cdr srcfile) all) (string-append all "return\n"))))

Is this a nice way to disable tests?  I dunno.  Why not change the test
name from TestFoo to DisabledTestFoo ?  Then it would not get run.

Also let's avoid car and cdr, and instead use match-lambda:

  (match-lambda
   ((file . pattern)
    ...))

But let's also avoid dotted pairs in bigger literal data structures;
it's ugly when there's lots of punctuation around.  So if you change the
lines to be like

  ("net/net_test.go" ".+TestShutdownUnix.+")

you can

  (match-lambda
   ((file pattern)
    ...))

Note the lack of " . ".

> +                (list
> +                 '("net/net_test.go" . ".+TestShutdownUnix.+")
> +                 '("net/dial_test.go" . ".+TestDialTimeout.+")

Here make the whole list a literal instead of calling `list' on a list
of quoted datums:

  '(("net/net_test.go" ".+TestHostname.+")
    ...)

Cheers,

Andy
Alex Vong June 6, 2016, 9:05 a.m. UTC | #2
Hello,

I think match-lambda is not documented in the guile manual (it only
appears in an example). While its usage is more or less the same as in
racket, I think it should be documented. What is your idea?

Thanks,
Alex

On 06/06/2016, Andy Wingo <wingo@igalia.com> wrote:
> Hi :)
>
> Looking good!  I have some style nits :)
>
> On Fri 03 Jun 2016 19:39, Matthew Jordan <matthewjordandevops@yandex.com>
> writes:
>
>> +               ;; Removing net/ tests
>> +               (for-each
>> +                (lambda (srcfile)
>> +                  (let ((srcfile (string-append "net/" srcfile)))
>> +                  (if (file-exists? srcfile)
>> +                      (delete-file srcfile))))
>> +                '("multicast_test.go" "parse_test.go" "port_test.go"))
>
> Either these files exist or they do not.  Better to just have three
> unconditional delete-file invocations.
>
>> +
>> +               ;; Add libgcc to runpath
>> +               (substitute* "cmd/go/build.go"
>> +                 (("cgoldflags := \\[\\]string\\{\\}")
>> +                  (string-append "cgoldflags := []string{"
>> +                                 "\"-rpath=" gcclib "\""
>> +                                 "}"))
>> +                 (("ldflags := buildLdflags")
>> +                  (string-append
>> +                   "ldflags := buildLdflags\n"
>> +                   "ldflags = append(ldflags, \"-r\")\n"
>> +                   "ldflags = append(ldflags, \"" gcclib "\")\n")))
>> +
>> +               (substitute* "os/os_test.go"
>> +                 (("/usr/bin") (getcwd))
>> +                 (("/bin/pwd") (which "pwd")))
>> +
>> +               ;; Disable failing tests
>> +               (for-each
>> +                (lambda (srcfile)
>> +                  (substitute* (car srcfile)
>> +                    (((cdr srcfile) all) (string-append all
>> "return\n"))))
>
> Is this a nice way to disable tests?  I dunno.  Why not change the test
> name from TestFoo to DisabledTestFoo ?  Then it would not get run.
>
> Also let's avoid car and cdr, and instead use match-lambda:
>
>   (match-lambda
>    ((file . pattern)
>     ...))
>
> But let's also avoid dotted pairs in bigger literal data structures;
> it's ugly when there's lots of punctuation around.  So if you change the
> lines to be like
>
>   ("net/net_test.go" ".+TestShutdownUnix.+")
>
> you can
>
>   (match-lambda
>    ((file pattern)
>     ...))
>
> Note the lack of " . ".
>
>> +                (list
>> +                 '("net/net_test.go" . ".+TestShutdownUnix.+")
>> +                 '("net/dial_test.go" . ".+TestDialTimeout.+")
>
> Here make the whole list a literal instead of calling `list' on a list
> of quoted datums:
>
>   '(("net/net_test.go" ".+TestHostname.+")
>     ...)
>
> Cheers,
>
> Andy
>
>
Andy Wingo June 6, 2016, 12:34 p.m. UTC | #3
On Mon 06 Jun 2016 11:05, Alex Vong <alexvong1995@gmail.com> writes:

> I think match-lambda is not documented in the guile manual (it only
> appears in an example). While its usage is more or less the same as in
> racket, I think it should be documented. What is your idea?

Yes it should be documented :)

Andy
diff mbox

Patch

From debf89e7a3456862b6de77e8d948b954d88bfca6 Mon Sep 17 00:00:00 2001
From: Matthew Jordan <matthewjordandevops@yandex.com>
Date: Thu, 26 May 2016 08:57:16 -0400
Subject: [PATCH] gnu: Add go@1.4

* gnu/local.mk: Modified file.
* gnu/packages/golang.scm: New file.

Co-author: Efraim Flashner <efraim@flashner.co.il>
Co-author: Andy Wingo <wingo@igalia.com>
---
 gnu/local.mk            |   1 +
 gnu/packages/golang.scm | 184 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 185 insertions(+)
 create mode 100644 gnu/packages/golang.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 59aaccc..1cae981 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -147,6 +147,7 @@  GNU_SYSTEM_MODULES =				\
   %D%/packages/gnustep.scm			\
   %D%/packages/gnuzilla.scm			\
   %D%/packages/gnu-pw-mgr.scm			\
+  %D%/packages/golang.scm			\
   %D%/packages/gperf.scm			\
   %D%/packages/gprolog.scm			\
   %D%/packages/gps.scm				\
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
new file mode 100644
index 0000000..c7e7e45
--- /dev/null
+++ b/gnu/packages/golang.scm
@@ -0,0 +1,184 @@ 
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
+;;; Copyright © 2016 Andy Wingo <wingo@igalia.com>
+;;;
+;;; This file is an addendum GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages golang)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix utils)
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pcre)
+  #:use-module (srfi srfi-1))
+
+;; According to https://golang.org/doc/install/gccgo, gccgo-4.8.2 includes a
+;; complete go-1.1.2 implementation, gccgo-4.9 includes a complete go-1.2
+;; implementation, and gccgo-5 a complete implementation of go-1.4.  Ultimately
+;; we hope to build go-1.5+ with a bootstrap process using gccgo-5.  As of
+;; go-1.5, go cannot be bootstrapped without go-1.4, so we need to use go-1.4 or
+;; gccgo-5.  Mips is not officially supported, but it should work if it is
+;; bootstrapped.
+
+(define-public go-1.4
+  (package
+    (name "go")
+    (version "1.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://storage.googleapis.com/golang/"
+                           name version ".src.tar.gz"))
+       (sha256
+        (base32
+         "0na9yqilzpvq0bjndbibfp07wr796gf252y471cip10bbdqgqiwr"))))
+    (build-system gnu-build-system)
+    (outputs '("out"
+               "doc"
+               "src"))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-after 'patch-generated-file-shebangs 'chdir
+           (lambda _ (chdir "src")))
+         (add-before 'build 'prebuild
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))
+                    (ld (string-append
+                         (assoc-ref inputs "glibc") "/lib"))
+                    (loader (car (find-files ld "^ld-linux.+")))
+                    (libgcc (string-append (assoc-ref inputs "gcc:lib") "/lib"))
+                    (net-base (assoc-ref inputs "net-base"))
+                    (tzdata-path
+                     (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))
+                    (output (assoc-ref outputs "out")))
+
+               ;; Removing net/ tests
+               (for-each
+                (lambda (srcfile)
+                  (let ((srcfile (string-append "net/" srcfile)))
+                  (if (file-exists? srcfile)
+                      (delete-file srcfile))))
+                '("multicast_test.go" "parse_test.go" "port_test.go"))
+
+               ;; Add libgcc to runpath
+               (substitute* "cmd/go/build.go"
+                 (("cgoldflags := \\[\\]string\\{\\}")
+                  (string-append "cgoldflags := []string{"
+                                 "\"-rpath=" gcclib "\""
+                                 "}"))
+                 (("ldflags := buildLdflags")
+                  (string-append
+                   "ldflags := buildLdflags\n"
+                   "ldflags = append(ldflags, \"-r\")\n"
+                   "ldflags = append(ldflags, \"" gcclib "\")\n")))
+
+               (substitute* "os/os_test.go"
+                 (("/usr/bin") (getcwd))
+                 (("/bin/pwd") (which "pwd")))
+
+               ;; Disable failing tests
+               (for-each
+                (lambda (srcfile)
+                  (substitute* (car srcfile)
+                    (((cdr srcfile) all) (string-append all "return\n"))))
+                (list
+                 '("net/net_test.go" . ".+TestShutdownUnix.+")
+                 '("net/dial_test.go" . ".+TestDialTimeout.+")
+                 '("os/os_test.go" . ".+TestHostname.+")
+                 '("time/format_test.go" . ".+TestParseInSydney.+")
+                 '("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.+")
+                 '("syscall/syscall_unix_test.go" . ".+TestPassFD\\(.+")
+                 '("os/exec/exec_test.go" . ".+TestExtraFiles.+")))
+               (substitute* "net/lookup_unix.go"
+                 (("/etc/protocols") (string-append net-base "/etc/protocols")))
+               (substitute* "time/zoneinfo_unix.go"
+                 (("/usr/share/zoneinfo/") tzdata-path))
+               (substitute*
+                   (find-files "cmd" "asm.c")
+                 (("/lib/ld-linux.*\\.so\\.[0-9]") loader)))))
+
+         (replace 'build
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((output (assoc-ref outputs "out")))
+               (setenv "CC" (which "gcc"))
+               (setenv "GOOS" "linux")
+               (setenv "GOROOT" (dirname (getcwd)))
+               (setenv "GOROOT_FINAL" output)
+               (setenv "CGO_ENABLED" "1")
+               (zero? (system* "sh" "all.bash")))))
+
+         (replace 'install
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             (let* ((output (assoc-ref outputs "out"))
+                    (doc_out (assoc-ref outputs "doc"))
+                    (bash (string-append (assoc-ref inputs "bash") "bin/bash"))
+                    (docs (string-append doc_out "/share/doc/" ,name "-" ,version))
+                    (src (string-append
+                            (assoc-ref outputs "src") "/share/" ,name "-" ,version)))
+               (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)))
+                '("README" "CONTRIBUTORS" "AUTHORS" "PATENTS"
+                  "LICENSE" "VERSION" "robots.txt"))
+               (copy-recursively "../" output)))))
+       #:tests? #f))
+    (inputs
+     `(("tzdata" ,tzdata)
+       ("pcre" ,pcre)))
+    (native-inputs
+     `(("pkg-config" ,%pkg-config)
+       ("which" ,which)
+       ("gcc:out" ,gcc-4.9 "out")
+       ("net-base" ,net-base)
+       ("perl" ,perl)))
+    (propagated-inputs
+     `(("gcc:lib" ,gcc-4.9 "lib")
+       ("glibc" ,glibc)))
+    (home-page "https://golang.org/")
+    (synopsis "Compiled, statically typed language developed by Google")
+    (description "Go, also commonly referred to as golang, is a programming
+ language developed at Google.  Designed primarily for systems programming, it
+ is a compiled, statically typed language in the tradition of C and C++, with
+garbage collection, various safety features and in the style of communicating
+sequential processes (CSP) concurrent programming features added.")
+    (license license:bsd-3)))
-- 
2.8.3