diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 10:07:35 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 11:47:09 -0500 |
| commit | 276f40fdc349d2ad62582b23ea55e061b689cfc0 (patch) | |
| tree | 8052d91aee78cf0d4317b41ec52134fde48fa5fb /gnu/packages/golang.scm | |
| parent | b2f6b6f6b9df6bcc24794238e7e97357470af95d (diff) | |
| parent | 6ba510d76d6847065be725e958718002f3b13c7a (diff) | |
| download | guix-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar.gz | |
Merge branch 'version-1.4.0'
With resolved conflicts in: gnu/packages/gnome.scm gnu/packages/openstack.scm gnu/packages/python-xyz.scm
Diffstat (limited to 'gnu/packages/golang.scm')
| -rw-r--r-- | gnu/packages/golang.scm | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index db95ef1309..e808d8ebf6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2451,16 +2451,7 @@ Go programming language.") #:phases (modify-phases %standard-phases ;; Source-only package - (delete 'build) - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (string-append (assoc-ref outputs "out") - "/src/golang.org/x/crypto/ed25519/testdata") - ".*\\.gz$")) - #t))))) + (delete 'build)))) (propagated-inputs (list go-golang-org-x-sys)) (synopsis "Supplementary cryptographic libraries in Go") @@ -3738,17 +3729,7 @@ SysVinit, and more.") (list go-golang-org-x-sys go-github-com-sirupsen-logrus go-golang-org-x-crypto)) (arguments - '(#:import-path "github.com/docker/distribution" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files - (assoc-ref outputs "out") - ".*\\.gz$")) - #t))))) + '(#:import-path "github.com/docker/distribution")) (home-page "https://github.com/docker/distribution") (synopsis "This package is a Docker toolset to pack, ship, store, and @@ -5571,17 +5552,7 @@ non-UTF-friendly sources.") "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/gdamore/tcell" - #:phases - (modify-phases %standard-phases - (add-before 'reset-gzip-timestamps 'make-files-writable - (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure .gz files are writable so that the - ;; 'reset-gzip-timestamps' phase can do its work. - (let ((out (assoc-ref outputs "out"))) - (for-each make-file-writable - (find-files out "\\.gz$")) - #t)))))) + `(#:import-path "github.com/gdamore/tcell")) (inputs (list go-github.com-mattn-go-runewidth go-golang-org-colorful go-golang-org-x-text go-github-com-gdamore-encoding)) |