From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:53348) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixBc1-0006rs-4n for guix-patches@gnu.org; Thu, 30 Jan 2020 10:20:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixBbw-0008LY-2z for guix-patches@gnu.org; Thu, 30 Jan 2020 10:20:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58385) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixBbu-0008K7-Oa for guix-patches@gnu.org; Thu, 30 Jan 2020 10:20:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ixBbu-0000fM-H1 for guix-patches@gnu.org; Thu, 30 Jan 2020 10:20:02 -0500 Subject: [bug#39317] [PATCH v2] gnu: Add go 1.13.7. References: <20200127214650.yzvoq6zqbzhkoi5o@zdrowyportier.kadziolka.net> In-Reply-To: <20200127214650.yzvoq6zqbzhkoi5o@zdrowyportier.kadziolka.net> Resent-Message-ID: Date: Thu, 30 Jan 2020 16:19:48 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200130151948.iyvfykj72lxfylqc@zdrowyportier.kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39317@debbugs.gnu.org Cc: leo@famulari.name * gnu/packages/golang.scm (go-source): Factor out the source fields of all the go versions into a new helper function. (go-1.4, go-1.12)[source]: Use go-source. (go-1.13): New variable. --- gnu/packages/golang.scm | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9102469749..2332218d29 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -63,19 +63,22 @@ ;; gccgo-5. Mips is not officially supported, but it should work if it is ;; bootstrapped. +(define (go-source version hash) + (origin + (method url-fetch) + (uri (string-append "https://storage.googleapis.com/golang/go" + version ".src.tar.gz")) + (sha256 (base32 hash)))) + (define-public go-1.4 (package (name "go") ;; The C-language bootstrap of Go: ;; https://golang.org/doc/install/source#go14 (version "1.4-bootstrap-20171003") - (source (origin - (method url-fetch) - (uri (string-append "https://storage.googleapis.com/golang/" - name version ".tar.gz")) - (sha256 - (base32 - "0liybk5z00hizsb5ypkbhqcawnwwa6mkwgvjjg4y3jm3ndg5pzzl")))) + (source + (go-source version + "0liybk5z00hizsb5ypkbhqcawnwwa6mkwgvjjg4y3jm3ndg5pzzl")) (build-system gnu-build-system) (outputs '("out" "doc" @@ -222,13 +225,8 @@ in the style of communicating sequential processes (@dfn{CSP}).") (name "go") (version "1.12.16") (source - (origin - (method url-fetch) - (uri (string-append "https://storage.googleapis.com/golang/" - name version ".src.tar.gz")) - (sha256 - (base32 - "1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf")))) + (go-source version + "1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf")) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) @@ -367,7 +365,6 @@ in the style of communicating sequential processes (@dfn{CSP}).") (docs (string-append doc_out "/share/doc/" ,name "-" ,version)) (src (string-append (assoc-ref outputs "tests") "/share/" ,name "-" ,version))) - (delete-file-recursively "../pkg/bootstrap") ;; 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 @@ -405,6 +402,14 @@ in the style of communicating sequential processes (@dfn{CSP}).") ,@(package-native-inputs go-1.4))) (supported-systems %supported-systems))) +(define-public go-1.13 + (package + (inherit go-1.12) + (version "1.13.7") + (source + (go-source version + "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4")))) + (define-public go go-1.12) (define-public go-github-com-alsm-ioprogress -- 2.25.0