me
/
guix
Archived
1
0
Fork 0
Code

gnu: docker: Synchronize docker dependencies with the current version of docker. 

* gnu/packages/docker.scm (docker-libnetwork): Update to 19.03-1.026aaba.
[source]: Follow URI redirection.
[arguments]: Adjust import-path accordingly.
[home-page]: Same.
* gnu/packages/networking.scm (go-sctp): Update to 0.0.0-2.6e2cb13.
[arguments]: Skip test suite.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
master
Jesse Dowell 2020-09-19 12:08:27 -04:00 committed by Efraim Flashner
parent 921fad1a5a
commit 87a13a5e30
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/docker.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -48,6 +49,8 @@
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization)) #:use-module (gnu packages virtualization))
;; Note - when changing Docker versions it is important to update the versions
;; of several associated packages (docker-libnetwork and go-sctp).
(define %docker-version "19.03.12") (define %docker-version "19.03.12")
(define-public python-docker (define-public python-docker
@ -246,22 +249,25 @@ network attachments.")
(define docker-libnetwork (define docker-libnetwork
;; There are no recent release for libnetwork, so choose the last commit of ;; There are no recent release for libnetwork, so choose the last commit of
;; the branch that Docker uses, as can be seen in the Docker source file ;; the branch that Docker uses, as can be seen in the Docker source file
;; 'hack/dockerfile/install/proxy.installer'. ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important that
(let ((commit "4725f2163fb214a6312f3beae5991f838ec36326") ;; this version is kept in sync with the version of Docker being used.
(version "18.09") ;; This commit is the "bump_19.03" branch, as mentioned in Docker's vendor.conf.
(let ((commit "026aabaa659832804b01754aaadd2c0f420c68b6")
(version (version-major+minor %docker-version))
(revision "1")) (revision "1"))
(package (package
(name "docker-libnetwork") (name "docker-libnetwork")
(version (git-version version "1" commit)) (version (git-version version revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/docker/libnetwork") ;; Redirected from github.com/docker/libnetwork.
(url "https://github.com/moby/libnetwork")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1zpnxki8qfzha6ljahpwd3vkzmjhsvkmf73w6crm4ilxxw5vnpfb")) "0bli21vn5v7bssw3ydym4jfdjsldhb47fld88kng7d138wl70lkw"))
;; Delete bundled ("vendored") free software source code. ;; Delete bundled ("vendored") free software source code.
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (snippet '(begin
@ -269,8 +275,8 @@ network attachments.")
#t)))) #t))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/docker/libnetwork/")) `(#:import-path "github.com/moby/libnetwork/"))
(home-page "https://github.com/docker/libnetwork/") (home-page "https://github.com/moby/libnetwork/")
(synopsis "Networking for containers") (synopsis "Networking for containers")
(description "Libnetwork provides a native Go implementation for (description "Libnetwork provides a native Go implementation for
connecting containers. The goal of @code{libnetwork} is to deliver a robust connecting containers. The goal of @code{libnetwork} is to deliver a robust

11
gnu/packages/networking.scm
View File

@ -39,6 +39,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1436,8 +1437,9 @@ handling network namespaces in Go.")
(define-public go-sctp (define-public go-sctp
;; docker-libnetwork-cmd-proxy requires this exact commit. ;; docker-libnetwork-cmd-proxy requires this exact commit.
(let ((commit "07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb") ;; This commit is mentioned in docker-libnetwork-cmd-proxy's vendor.conf.
(revision "1")) (let ((commit "6e2cb1366111dcf547c13531e3a263a067715847")
(revision "2"))
(package (package
(name "go-sctp") (name "go-sctp")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -1449,10 +1451,11 @@ handling network namespaces in Go.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mk9ncm10gwi5pn5wcw4skbyf4qg7n5qdf1mim4gf3mrckvi6g6h")))) "1ba90fmpdwxa1ba4hrsjhi3gfy3pwmz7x8amw1p5dc9p5a7nnqrb"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
`(#:import-path "github.com/ishidawataru/sctp")) `(#:tests? #f ; Test suite is flakey.
#:import-path "github.com/ishidawataru/sctp"))
(home-page "https://github.com/ishidawataru/sctp") (home-page "https://github.com/ishidawataru/sctp")
(synopsis "SCTP library for the Go programming language") (synopsis "SCTP library for the Go programming language")
(description "This library provides methods for using the stream control (description "This library provides methods for using the stream control