mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'version-1.4.0'
With resolved conflicts in: gnu/packages/gnome.scm gnu/packages/openstack.scm gnu/packages/python-xyz.scm
This commit is contained in:
commit
276f40fdc3
71 changed files with 1962 additions and 1643 deletions
|
@ -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))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue