From c6bc0fc3a5b20b1548b550211382acf06308b5dd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 25 Jan 2019 15:17:26 -0500 Subject: gnu: Go: Update to 1.11.5 [fixes CVE-2019-6486]. * gnu/packages/golang.scm (go-1.11): Update to 1.11.5. [arguments]: Add a 'tarbomb-workaround' phase and adapt the 'chdir' phase for the tarbomb. --- gnu/packages/golang.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a571477ef2..e6269f526f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -406,7 +406,7 @@ (define-public go-1.11 (package (inherit go-1.9) (name "go") - (version "1.11.4") + (version "1.11.5") (source (origin (method url-fetch) @@ -414,11 +414,23 @@ (define-public go-1.11 name version ".src.tar.gz")) (sha256 (base32 - "05fvp8dq0yffsrvdyii4wgl756dn0xkgm5a80al7j7kb19r45zac")))) + "0gllmbjvp12iszwils8id78mvjxwviwf98lh2gdkb236n4mz07mw")))) (arguments (substitute-keyword-arguments (package-arguments go-1.9) ((#:phases phases) `(modify-phases ,phases + ;; XXX Work around the Go 1.11.5 tarbomb. + ;; + (add-after 'unpack 'tarbomb-workaround + (lambda _ + (chdir "..") + (delete-file-recursively "gocache") + (delete-file-recursively "tmp") + #t)) + (replace 'chdir + (lambda _ + (chdir "go/src") + #t)) (replace 'prebuild (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) -- cgit v1.2.3 From bc58bb9bdfbe5b2128d96416611994f14b5b1757 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 1 Feb 2019 12:21:38 +0100 Subject: gnu: Add go-github-com-direnv-go-dotenv. * gnu/packages/golang.scm (go-github-com-direnv-go-dotenv): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e6269f526f..cedfabe5bf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3365,3 +3365,28 @@ (define-public go-github-com-kr-fs (synopsis "Filesystem-related functions for Go") (description "Package fs provides filesystem-related functions.") (license license:bsd-3)))) + +(define-public go-github-com-direnv-go-dotenv + (let ((commit "4cce6d1a66f7bc8dc730eab85cab6af1b801abed") + (revision "0")) + (package + (name "go-github-com-direnv-go-dotenv") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/direnv/go-dotenv") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00wn4fc2lma0csf6ryvlc6k9jbpbifm4n7i3kkd2xrfw5qlm29b6")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/direnv/go-dotenv")) + (home-page "https://github.com/direnv/go-dotenv") + (synopsis "Go dotenv parsing library") + (description "This package provides a library for parsing the dotenv +format in Go.") + (license license:expat)))) -- cgit v1.2.3 From 1009e6e7ecc00b72a51778e90b0212ccc33bfa7a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 1 Feb 2019 22:42:49 +0200 Subject: gnu: go@1.4: Build with binutils-gold on armhf and aarch64. * gnu/packages/golang.scm (go@1.4)[native-inputs]: Add binutils-gold for armhf-linux and aarch64-linux. --- gnu/packages/golang.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cedfabe5bf..7dbe27c2ee 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Andy Wingo ;;; Copyright © 2016 Ludovic Courtès @@ -399,6 +399,10 @@ (define-public go-1.9 #t))))))) (native-inputs `(("go" ,go-1.4) + ,@(match (%current-system) + ((or "armhf-linux" "aarch64-linux") + `(("gold" ,binutils-gold))) + (_ `())) ,@(package-native-inputs go-1.4))) (supported-systems %supported-systems))) -- cgit v1.2.3 From c5b806a94ae2cd3618fce8225700ad89195c8d7a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 4 Feb 2019 12:13:07 +0100 Subject: gnu: go-github-com-minio-sha256-simd: Remove duplicate. * gnu/packages/syncthing.scm (go-github-com-minio-sha256-simd): Remove duplicate. * gnu/packages/golang.scm (go-github-com-minio-sha256-simd): Bump revision to supersede the older duplicate. --- gnu/packages/golang.scm | 2 +- gnu/packages/syncthing.scm | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7dbe27c2ee..768e641786 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2734,7 +2734,7 @@ (define-public go-github-com-btcsuite-btcd-btcec (define-public go-github-com-minio-sha256-simd (let ((commit "51976451ce1942acbb55707a983ed232fa027110") - (revision "0")) + (revision "2")) (package (name "go-github-com-minio-sha256-simd") (version (git-version "0.0.0" revision commit)) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 0df4e093eb..92eda1c9b1 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -366,31 +366,6 @@ (define-public go-github-com-lib-pq (home-page "https://github.com/lib/pq") (license expat)))) -(define-public go-github-com-minio-sha256-simd - (let ((commit "ad98a36ba0da87206e3378c556abbfeaeaa98668") - (revision "1")) - (package - (name "go-github-com-minio-sha256-simd") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minio/sha256-simd") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0yfnqn3kqdnlfm54yvc4fr5vpdmwdi2kw571nlkbpmy8ldhsqqfi")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/minio/sha256-simd")) - (synopsis "Hardware-accelerated SHA256 in Go using SIMD") - (description "This packages provides a pure Go implementation of SHA256 -using SIMD (Single instruction, multiple data) instructions for Intel and ARM -architectures.") - (home-page "https://github.com/minio/sha256-simd") - (license asl2.0)))) - (define-public go-github-com-oschwald-geoip2-golang (package (name "go-github-com-oschwald-geoip2-golang") -- cgit v1.2.3