;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020 Jesse Dowell ;;; ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 3 of the License, or (at ;;; your option) any later version. ;;; ;;; GNU Guix is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;;; GNU General Public License for more detai
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/terminals.scm')
-rw-r--r--gnu/packages/terminals.scm4
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index eea8490272..83eed3e036 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
;;; Copyright © 2016, 2017, 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@@ -430,8 +430,6 @@ to all types of devices that provide serial consoles.")
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
- (native-inputs
- `(("gcc" ,gcc-8))) ; for ‘-fstack-clash-protection’
(synopsis "Linux command-line utility to control the PC speaker")
(description "beep allows the user to control the PC speaker with precision,
allowing different sounds to indicate different events. While it can be run
git-fetch) (uri (git-reference (url "https://github.com/containerd/containerd") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0")) (patches (search-patches "containerd-test-with-go1.13.patch")))) (build-system go-build-system) (arguments `(#:import-path "github.com/containerd/containerd" #:phases (modify-phases %standard-phases (add-before 'build 'chdir (lambda _ (chdir "src/github.com/containerd/containerd") #t)) (add-after 'chdir 'patch-paths (lambda* (#:key inputs outputs #:allow-other-keys) ;; TODO: Patch "socat", "unpigz". (substitute* "./runtime/v1/linux/runtime.go" (("defaultRuntime[ \t]*=.*") (string-append "defaultRuntime = \"" (assoc-ref inputs "runc") "/sbin/runc\"\n")) (("defaultShim[ \t]*=.*") (string-append "defaultShim = \"" (assoc-ref outputs "out") "/bin/containerd-shim\"\n"))) (substitute* "./vendor/github.com/containerd/go-runc/runc.go" (("DefaultCommand[ \t]*=.*") (string-append "DefaultCommand = \"" (assoc-ref inputs "runc") "/sbin/runc\"\n"))) (substitute* "vendor/github.com/containerd/continuity/testutil/loopback/loopback_linux.go" (("exec\\.Command\\(\"losetup\"") ; ) (string-append "exec.Command(\"" (assoc-ref inputs "util-linux") "/sbin/losetup\""))) ;) #t)) (replace 'build (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" make-flags))) (replace 'install (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))) (apply invoke "make" (string-append "DESTDIR=" out) "install" make-flags))))))) (inputs `(("btrfs-progs" ,btrfs-progs) ("libseccomp" ,libseccomp) ("runc" ,runc) ("util-linux" ,util-linux))) (native-inputs `(("go" ,go) ("pkg-config" ,pkg-config))) (synopsis "Docker container runtime") (description "This package provides the container daemon for Docker. It includes image transfer and storage, container execution and supervision, network attachments.") (home-page "https://containerd.io/") (license license:asl2.0))) ;;; Private package that shouldn't be used directly; its purposes is to be ;;; used as a template for the various packages it contains. It doesn't build ;;; anyway, as it needs many dependencies that aren't being satisfied. (define docker-libnetwork ;; 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 ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important that ;; this version is kept in sync with the version of Docker being used. ;; 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")) (package (name "docker-libnetwork") (version (git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference ;; Redirected from github.com/docker/libnetwork. (url "https://github.com/moby/libnetwork") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "0bli21vn5v7bssw3ydym4jfdjsldhb47fld88kng7d138wl70lkw")) ;; Delete bundled ("vendored") free software source code. (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "vendor") #t)))) (build-system go-build-system) (arguments `(#:import-path "github.com/moby/libnetwork/")) (home-page "https://github.com/moby/libnetwork/") (synopsis "Networking for containers") (description "Libnetwork provides a native Go implementation for connecting containers. The goal of @code{libnetwork} is to deliver a robust container network model that provides a consistent programming interface and the required network abstractions for applications.") (license license:asl2.0)))) (define-public docker-libnetwork-cmd-proxy (package (inherit docker-libnetwork) (name "docker-libnetwork-cmd-proxy") (arguments `(#:import-path "github.com/docker/libnetwork/cmd/proxy" #:unpack-path "github.com/docker/libnetwork" #:install-source? #f)) (native-inputs `(("go-sctp" ,go-sctp) ;; For tests. ("logrus" ,go-github-com-sirupsen-logrus) ("go-netlink" ,go-netlink) ("go-netns" ,go-netns) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-sys" ,go-golang-org-x-sys))) (synopsis "Docker user-space proxy") (description "A proxy running in the user space. It is used by the built-in registry server of Docker.") (license license:asl2.0))) ;; TODO: Patch out modprobes for ip_vs, nf_conntrack, ;; brige, nf_conntrack_netlink, aufs. (define-public docker (package (name "docker") (version %docker-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/docker/engine") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1dj6llfcgcbpq9q9j6b4wb0anbn1g5wzm8ikq2lyhg54i3154m93")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) ((guix build go-build-system) #:prefix go:) (guix build union) (guix build utils)) #:imported-modules (,@%gnu-build-system-modules (guix build union) (guix build go-build-system)) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "builder/builder-next/executor_unix.go" (("CommandCandidates:.*runc.*") (string-append "CommandCandidates: []string{\"" (assoc-ref inputs "runc") "/sbin/runc\"},\n"))) (substitute* "vendor/github.com/containerd/go-runc/runc.go" (("DefaultCommand = .*") (string-append "DefaultCommand = \"" (assoc-ref inputs "runc") "/sbin/runc\"\n"))) (substitute* "vendor/github.com/containerd/containerd/runtime/v1/linux/runtime.go" (("defaultRuntime[ \t]*=.*") (string-append "defaultRuntime = \"" (assoc-ref inputs "runc") "/sbin/runc\"\n")) (("defaultShim[ \t]*=.*") (string-append "defaultShim = \"" (assoc-ref inputs "containerd") "/bin/containerd-shim\"\n"))) (substitute* "daemon/daemon_unix.go" (("DefaultShimBinary = .*") (string-append "DefaultShimBinary = \"" (assoc-ref inputs "containerd") "/bin/containerd-shim\"\n")) (("DefaultRuntimeBinary = .*") (string-append "DefaultRuntimeBinary = \"" (assoc-ref inputs "runc") "/sbin/runc\"\n")) (("DefaultRuntimeName = .*") (string-append "DefaultRuntimeName = \"" (assoc-ref inputs "runc") "/sbin/runc\"\n"))) (substitute* "daemon/config/config.go" (("StockRuntimeName = .*") (string-append "StockRuntimeName = \"" (assoc-ref inputs "runc") "/sbin/runc\"\n")) (("DefaultInitBinary = .*") (string-append "DefaultInitBinary = \"" (assoc-ref inputs "tini") "/bin/tini\"\n"))) (substitute* "daemon/config/config_common_unix_test.go" (("expectedInitPath: \"docker-init\"") (string-append "expectedInitPath: \"" (assoc-ref inputs "tini") "/bin/tini\""))) (substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go" (("var defaultCommandCandidates = .*") (string-append "var defaultCommandCandidates = []string{\"" (assoc-ref inputs "runc") "/sbin/runc\"}"))) (substitute* "vendor/github.com/docker/libnetwork/portmapper/proxy.go" (("var userlandProxyCommandName = .*") (string-append "var userlandProxyCommandName = \"" (assoc-ref inputs "docker-proxy") "/bin/proxy\"\n"))) (substitute* "pkg/archive/archive.go" (("string\\{\"xz") (string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz"))) ;; TODO: Remove when Docker proper uses v1.14.x to build (substitute* "registry/resumable/resumablerequestreader_test.go" (("I%27m%20not%20an%20url" all) (string-append "\"" all "\""))) ;; TODO: Remove when Docker proper uses v1.14.x to build (substitute* "vendor/gotest.tools/x/subtest/context.go" (("func \\(tc \\*testcase\\) Cleanup\\(" all) (string-append all "func()")) (("tc\\.Cleanup\\(" all) (string-append all "nil"))) (let ((source-files (filter (lambda (name) (not (string-contains name "test"))) (find-files "." "\\.go$")))) (let-syntax ((substitute-LookPath* (syntax-rules () ((_ (source-text package relative-path) ...) (substitute* source-files (((string-append "\\ .pc) ("go" ,go) ("gotestsum" ,gotestsum) ("pkg-config" ,pkg-config))) (synopsis "Docker container component library, and daemon") (description "This package provides a framework to assemble specialized container systems. It includes components for orchestration, image management, secret management, configuration management, networking, provisioning etc.") (home-page "https://mobyproject.org/") (license license:asl2.0))) (define-public docker-cli (package (name "docker-cli") (version %docker-version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/docker/cli") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1bynmnaykhh1m42v6bxparlpm9kajpqsvlrlwgz1b9ivcklf5ik6")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" ;; TODO: Tests require a running Docker daemon. #:tests? #f #:phases (modify-phases %standard-phases (add-before 'build 'setup-environment-2 (lambda _ ;; Respectively, strip the symbol table and debug ;; information, and the DWARF symbol table. (setenv "LDFLAGS" "-s -w") ;; Make sure "docker -v" prints a usable version string. (setenv "VERSION" ,%docker-version) ;; Make build reproducible. (setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00") (symlink "src/github.com/docker/cli/scripts" "./scripts") (symlink "src/github.com/docker/cli/docker.Makefile" "./docker.Makefile") #t)) (replace 'build (lambda _ (invoke "./scripts/build/dynbinary"))) (replace 'check (lambda* (#:key make-flags tests? #:allow-other-keys) (setenv "PATH" (string-append (getcwd) "/build:" (getenv "PATH"))) (if tests? ;; Use the newly-built docker client for the tests. (with-directory-excursion "src/github.com/docker/cli" ;; TODO: Run test-e2e as well? (apply invoke "make" "-f" "docker.Makefile" "test-unit" (or make-flags '()))) #t))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (out-bin (string-append out "/bin")) (etc (string-append out "/etc"))) (with-directory-excursion "src/github.com/docker/cli/contrib/completion" (install-file "bash/docker" (string-append etc "/bash_completion.d")) (install-file "fish/docker.fish" (string-append etc "/fish/completions")) (install-file "zsh/_docker" (string-append etc "/zsh/site-functions"))) (chdir "build") (install-file "docker" out-bin) #t)))))) (native-inputs `(("go" ,go) ("libltdl" ,libltdl) ("pkg-config" ,pkg-config))) (synopsis "Command line interface to Docker") (description "This package provides a command line interface to Docker.") (home-page "https://www.docker.com/") (license license:asl2.0))) (define-public cqfd (package (name "cqfd") (version "5.1.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/cqfd") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1xhydz01f2rrnw7rmnaxh3f3q1ariq7j2ig0i0w1p3wn10l3q0nv")))) (build-system gnu-build-system) (arguments ;; The test suite requires a docker daemon and connectivity. `(#:tests? #f #:phases (modify-phases %standard-phases (delete 'configure) (delete 'build) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Fix the directory of the bash completion. (substitute* "Makefile" (("completionsdir=.*$") (string-append "completionsdir=" out "/etc/bash_completion.d; \\\n"))) (invoke "make" "install" (string-append "PREFIX=" out)))))))) (home-page "https://github.com/savoirfairelinux/cqfd") (synopsis "Convenience wrapper for Docker") (description "cqfd is a Bash script that provides a quick and convenient way to run commands in the current directory, but within a Docker container defined in a per-project configuration file.") (license license:gpl3+))) (define-public tini (package (name "tini") (version "0.18.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/krallin/tini") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;tests require a Docker daemon #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-static-build ;; Disable the static build as it fails to install, with ;; the error: "No valid ELF RPATH or RUNPATH entry exists ;; in the file". (lambda _ (substitute* "CMakeLists.txt" ((".*tini-static.*") "")) #t))))) (home-page "https://github.com/krallin/tini") (synopsis "Tiny but valid init for containers") (description "Tini is an init program specifically designed for use with containers. It manages a single child process and ensures that any zombie processes produced from it are reaped and that signals are properly forwarded. Tini is integrated with Docker.") (license license:expat)))