rekahsoft-gnu: Update spaceship-prompt to 4.15.0

podman, buildah (and dependencies) are now packaged upstream in guix.

rekahsoft-gnu/packages/emacs-xyz.scm

@@ -213,47 +213,6 @@ Functions and variables with // in their name are private and may change or
 go away at any time.")
     (license #f)))
 
-;; TODO: ./rekahsoft-gnu/packages/emacs-xyz.scm:323:6: emacs-mu4e-maildirs-extension@20180606.812: URI https://melpa.org/packages/mu4e-maildirs-extension-20180606.812.el not reachable: 404 ("Not Found")
-(define-public emacs-mu4e-maildirs-extension
-  (package
-    (name "emacs-mu4e-maildirs-extension")
-    (version "20180606.812")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://melpa.org/packages/mu4e-maildirs-extension-"
-                    version ".el"))
-              (sha256
-               (base32
-                "0rcn8mkabhn3w010hchr3xg72z7815j8fshfrcgxxcf9kygsg85b"))))
-    (build-system emacs-build-system)
-    (propagated-inputs `(("emacs-dash" ,emacs-dash)))
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (replace 'build
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (invoke "emacs"
-                       "-batch"
-                       "--eval"
-                       "(provide 'mu4e)"
-                       "--eval"
-                       "(defvar mu4e~main-buffer-name \"tests\")"
-                       "--eval"
-                       "(defvar mu4e-mu-binary \"mu\")"
-                       "--eval"
-                       "(require 'cl)"
-                       "-l"
-                       "dash.el"
-                       "-l"
-                       "mu4e-maildirs-extension.el"
-                       "--eval"
-                       "(byte-compile-file \"mu4e-maildirs-extension.el\")"))))))
-    (home-page "https://github.com/agpchil/mu4e-maildirs-extension")
-    (synopsis "Show mu4e maildirs summary in mu4e-main-view")
-    (description "Runs a mu command (async) in a shell process for each
-maildir to count unread and total mails.")
-    (license license:gpl3)))
-
 (define-public emacs-helm-unicode
   (package
     (name "emacs-helm-unicode")
@@ -658,187 +617,6 @@ dashboard!")
      "Solarized Dark version of the Bigblow Org HTML export theme.")
     (license license:gpl3+)))
 
-(define-public emacs-matlab-mode
-  (package
-    (name "emacs-matlab-mode")
-    (version "20210726.858")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://git.code.sf.net/p/matlab-emacs/src")
-                    (commit "c25894b91225ccdf0044f04020adf97cb41e73e4")))
-              (sha256
-               (base32
-                "0kns1f5kg4z5wqi26mql4ja2lm1rm8zji4sjiqqlbrnk800iic55"))))
-    (build-system emacs-build-system)
-    (arguments
-     '(#:include '("^[^/]+.el$" "^[^/]+.m$")
-       #:exclude '()
-       #:phases (modify-phases %standard-phases
-                  ;; Fails with error 'unable to locate  "?$"'
-                  (delete 'patch-el-files))))
-    (home-page "http://matlab-emacs.sourceforge.net/")
-    (synopsis "Major mode for MATLAB(R) dot-m files")
-    (description "No description available.")
-    (license license:gpl3)))
-
-;; TODO: send upsteam
-(define-public emacs-eval-in-repl
-  (package
-    (name "emacs-eval-in-repl")
-    (version "20201121.1341")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/kaz-yos/eval-in-repl")
-                    (commit "2abb9ccf6f08ae3a5ab504f0b3fd81ce0345b766")))
-              (sha256
-               (base32
-                "1707c7v6n2w94nnlb6n08y2m11bh7abm6fks2zrf0i80srxb8mrk"))))
-    (build-system emacs-build-system)
-    (propagated-inputs `(("emacs-dash" ,emacs-dash)
-                         ("emacs-paredit" ,emacs-paredit)
-                         ("emacs-ace-window" ,emacs-ace-window)
-                         ("emacs-cider" ,emacs-cider)
-                         ("emacs-elm-mode" ,emacs-elm-mode)
-                         ("emacs-erlang" ,emacs-erlang)
-                         ("emacs-geiser" ,emacs-geiser)
-                         ("emacs-hy-mode" ,emacs-hy-mode)
-                         ("emacs-elixir-mode" ,emacs-elixir-mode)
-                         ("emacs-alchemist" ,emacs-alchemist)
-                         ("emacs-js-comint" ,emacs-js-comint)
-                         ("emacs-lua-mode" ,emacs-lua-mode)
-                         ("emacs-tuareg" ,emacs-tuareg)
-                         ("emacs-racket-mode" ,emacs-racket-mode)
-                         ("emacs-inf-ruby" ,emacs-inf-ruby)
-                         ("emacs-slime" ,emacs-slime)
-                         ("emacs-sly" ,emacs-sly)
-                         ("emacs-sml-mode" ,emacs-sml-mode)))
-    (home-page "https://github.com/kaz-yos/eval-in-repl")
-    (synopsis "Consistent ESS-like eval interface for various REPLs")
-    (description
-     "Provides a consistent ESS-like eval interface for various REPLs
-
-This package does what ESS does for R for various REPLs, including ielm.
-
-Emacs Speaks Statistics (ESS) package has a nice function called
-ess-eval-region-or-line-and-step, which is assigned to C-RET.
-This function sends a line or a selected region to the corresponding
-shell (R, Julia, Stata, etc) visibly. It also start up a shell if
-there is none.
-
-This package along with REPL/shell specific packages implement similar
-work flow for various REPLs.")
-    (license license:expat)))
-
-(define-public emacs-org-babel-eval-in-repl
-  (package
-    (name "emacs-org-babel-eval-in-repl")
-    (version "20201206.1540")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/diadochos/org-babel-eval-in-repl")
-                    (commit "3591f062873de2d64cc6f83b3555d030506e6ee7")))
-              (sha256
-               (base32
-                "1fjifl69qja3ab0g72f1hkfns992qq0v9pw8p4hgvjycx7fpzk0a"))))
-    (build-system emacs-build-system)
-    (propagated-inputs `(("emacs-eval-in-repl" ,emacs-eval-in-repl)
-                         ("emacs-matlab-mode" ,emacs-matlab-mode)
-                         ("emacs-ess" ,emacs-ess)))
-    (home-page "https://github.com/diadochos/org-babel-eval-in-repl")
-    (synopsis "Eval org-mode babel code blocks in various REPLs.")
-    (description
-     "Allows one to execute org-mode (babel) source code blocks with eval-in-repl.
-
-@itemize
-@item Async execution (because it uses an external process!)
-@item Babel execution without the output written in the buffer (Less visual
-distraction! Output is reproducible as long as the code is saved)
-@end itemize
-
-For usage details, see @uref{https://github.com/diadochos/org-babel-eval-in-repl#usage}")
-    (license license:expat)))
-
-(define-public emacs-alchemist
-  (package
-    (name "emacs-alchemist")
-    (version "20180312.1304")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/tonini/alchemist.el")
-                    (commit "6f99367511ae209f8fe2c990779764bbb4ccb6ed")))
-              (sha256
-               (base32
-                "12f95rwxs11sqf1w9pnf6cxc2lh2jz4nqkq33p8b5yamnl8cq9kg"))))
-    (build-system emacs-build-system)
-    (propagated-inputs `(("emacs-elixir-mode" ,emacs-elixir-mode)
-                         ("emacs-dash" ,emacs-dash)
-                         ("emacs-company" ,emacs-company)
-                         ("emacs-pkg-info" ,emacs-pkg-info)
-                         ("emacs-s" ,emacs-s)))
-    (arguments
-     '(#:include '("^[^/]+.el$" "^[^/]+.el.in$"
-                   "^dir$"
-                   "^[^/]+.info$"
-                   "^[^/]+.texi$"
-                   "^[^/]+.texinfo$"
-                   "^doc/dir$"
-                   "^doc/[^/]+.info$"
-                   "^doc/[^/]+.texi$"
-                   "^doc/[^/]+.texinfo$"
-                   "^[^/]+.exs$"
-                   "^alchemist-server$")
-       #:exclude '("^.dir-locals.el$" "^test.el$" "^tests.el$"
-                   "^[^/]+-test.el$" "^[^/]+-tests.el$")))
-    (home-page "http://www.github.com/tonini/alchemist.el")
-    (synopsis "Elixir tooling integration into Emacs")
-    (description
-     "Alchemist brings you all the Elixir tooling and power inside your Emacs editor.
-
-Alchemist comes with a bunch of features, which are:
-
-@itemize
-@item Mix integration
-@item Compile & Execution of Elixir code
-@item Inline code evaluation
-@item Inline macro expanding
-@item Documentation lookup
-@item Definition lookup
-@item Powerful IEx integration
-@item Smart code completion
-@item Elixir project management
-@item Phoenix support
-@end itemize")
-    (license license:gpl3)))
-
-;; TODO: send upstream
-(define-public emacs-js-comint
-  (package
-    (name "emacs-js-comint")
-    (version "20200117.615")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/redguardtoo/js-comint")
-                    (commit "0dedaf4753fbe8cdbab14aa85f05d7673cbee8b6")))
-              (sha256
-               (base32
-                "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/redguardtoo/js-comint")
-    (synopsis "JavaScript interpreter in window.")
-    (description
-     "Provides a comint mode for Emacs which allows you to run a
-compatible javascript repl like Node.js/Spidermonkey/Rhino inside Emacs.
-It also defines a few functions for sending javascript input to it
-quickly.
-
-For usage details, see @uref{https://github.com/redguardtoo/js-comint#usage}")
-    (license license:gpl3)))
-
 ;; TODO: send upstream
 (define-public emacs-rcirc-notify
   (let ((commit "841a7b5a6cdb0c11a812df924d2c6a7d364fd455")
@@ -973,3 +751,22 @@ TODO headings.")
      "This package aims to provide an easy interface to creating per project org-mode
 TODO headings.")
     (license license:gpl3)))
+
+(define-public emacs-vc-fossil
+  (package
+    (name "emacs-vc-fossil")
+     (version "20230504.1626")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/venks1/emacs-fossil.git")
+                     (commit "4a4a3e4df83ba2f1ea8bfd8aa7e9f9b2c1c32ca9")))
+               (sha256 (base32
+                        "0djsi68v075zza6c9jgim3bf8zfjhi44mn350jxcs5yibph8n9ni"))))
+     (build-system emacs-build-system)
+     (home-page "https://tumbleweed.nu/r/vc-fossil/doc/tip/README.md")
+     (synopsis
+      "VC backend for the fossil sofware configuraiton management system")
+     (description
+      "This file contains a VC backend for the fossil version control system.")
+     (license license:gpl3+)))

rekahsoft-gnu/packages/shellutils.scm

@@ -29,6 +29,7 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages gawk)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
@@ -104,7 +105,7 @@ files, command history, processes, hostnames, bookmarks, git commits, etc..")
 (define-public spaceship-prompt
   (package
     (name "spaceship-prompt")
-    (version "3.16.5")
+    (version "4.15.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -113,8 +114,11 @@ files, command history, processes, hostnames, bookmarks, git commits, etc..")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1l5vla2wyzcp96xxh41l4fsss23rshm8h7xnwkrziwa45y6jy7hj"))))
+                "0fndp1kvp7wayw2hmkx9j0pl3d850gcnl232fxy13r10504rj9j0"))))
     (build-system gnu-build-system)
+    (propagated-inputs
+     `(("sed" ,sed)
+       ("gawk" ,gawk)))
     (arguments
      `(#:phases (modify-phases %standard-phases
                   (delete 'configure)
@@ -133,7 +137,7 @@ files, command history, processes, hostnames, bookmarks, git commits, etc..")
                                     (copy-recursively dir
                                                       (string-append
                                                        install-path "/" dir)))
-                                  '("lib" "modules" "sections"))
+                                  '("lib" "sections"))
                         (copy-file "spaceship.zsh"
                                    (string-append install-path
                                                   "/spaceship.zsh"))

rekahsoft-gnu/packages/virtualization.scm

@@ -1,344 +0,0 @@
-;;; Copyright © 2020 Collin J. Doering <collin@rekahsoft.ca>
-;;;
-;;; This file is part of the GNU Guix channel rekahsoft-guix
-;;;
-;;; The rekahsoft-guix channel for 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.
-;;;
-;;; The rekahsoft-guix channel for 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 details.
-;;;
-;;; You should have received a copy of the GNU General Public License along
-;;; with the rekahsoft-guix channel for GNU Guix.  If not, see
-;;; <http://www.gnu.org/licenses/>.
-
-(define-module (rekahsoft-gnu packages virtualization)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages admin)
-  #:use-module (gnu packages assembly)
-  #:use-module (gnu packages attr)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages backup)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages bison)
-  #:use-module (gnu packages check)
-  #:use-module (gnu packages cmake)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages cross-base)
-  #:use-module (gnu packages curl)
-  #:use-module (gnu packages cyrus-sasl)
-  #:use-module (gnu packages debian)
-  #:use-module (gnu packages disk)
-  #:use-module (gnu packages dns)
-  #:use-module (gnu packages docbook)
-  #:use-module (gnu packages documentation)
-  #:use-module (gnu packages figlet)
-  #:use-module (gnu packages firmware)
-  #:use-module (gnu packages flex)
-  #:use-module (gnu packages fontutils)
-  #:use-module (gnu packages freedesktop)
-  #:use-module (gnu packages gettext)
-  #:use-module (gnu packages gl)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages golang)
-  #:use-module (gnu packages graphviz)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages haskell)
-  #:use-module (gnu packages haskell-apps)
-  #:use-module (gnu packages haskell-check)
-  #:use-module (gnu packages haskell-crypto)
-  #:use-module (gnu packages haskell-web)
-  #:use-module (gnu packages haskell-xyz)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages libbsd)
-  #:use-module (gnu packages libusb)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages m4)
-  #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages nettle)
-  #:use-module (gnu packages networking)
-  #:use-module (gnu packages onc-rpc)
-  #:use-module (gnu packages package-management)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages polkit)
-  #:use-module (gnu packages protobuf)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-crypto)
-  #:use-module (gnu packages python-web)
-  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages pulseaudio)
-  #:use-module (gnu packages selinux)
-  #:use-module (gnu packages sdl)
-  #:use-module (gnu packages sphinx)
-  #:use-module (gnu packages spice)
-  #:use-module (gnu packages ssh)
-  #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages textutils)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages version-control)
-  #:use-module (gnu packages virtualization)
-  #:use-module (gnu packages web)
-  #:use-module (gnu packages wget)
-  #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg)
-  #:use-module (guix build-system cmake)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system go)
-  #:use-module (guix build-system meson)
-  #:use-module (guix build-system python)
-  #:use-module (guix build-system trivial)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module ((guix licenses)
-                #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (srfi srfi-1)
-  #:use-module (ice-9 match))
-
-(define-public libpod
-  (package
-    (name "libpod")
-    (version "1.4.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/containers/libpod.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "05xbxldhm3cgdjysidzpc8wnq17mgd84mq60jmbq6zcc9jl21axh"))))
-    (build-system go-build-system)
-    (native-inputs `(("gpgme" ,gpgme)
-                     ("pkg-config" ,pkg-config)
-                     ("libassuan" ,libassuan)
-                     ("libseccomp" ,libseccomp)
-                     ("go-md2man" ,go-md2man)))
-    (propagated-inputs `(("runc" ,runc)
-                         ("conmon" ,conmon)
-                         ("slirp4netns" ,slirp4netns)))
-    (arguments
-     '(#:import-path "github.com/containers/libpod"
-       #:phases (modify-phases %standard-phases
-                  (replace 'build
-                    (lambda _
-                      (with-directory-excursion "src/github.com/containers/libpod"
-                        (setenv "HOME" "/tmp")
-                        (invoke "make" "all" "GIT_COMMIT=NONE"
-                                "GIT_BRANCH=NONE"))))
-                  ;; FIXME: tests currently require docker
-                  ;; (replace 'check
-                  ;; (lambda _
-                  ;; (with-directory-excursion "src/github.com/containers/libpod"
-                  ;; (setenv "HOME" "/tmp")
-                  ;; (invoke "make" "test"))))
-                  (delete 'check)
-                  (replace 'install
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        (with-directory-excursion "src/github.com/containers/libpod"
-                          (invoke "make" "install"
-                                  (string-append "PREFIX=" out)
-                                  (string-append "DESTDIR=" out)))))))))
-    (synopsis "Library used to create containers pods and home of Podman")
-    (description
-     "Libpod provides a library for applications looking to use the container
-pod concept, popularized by kubernets.  Libpod also contains the pod manager
-tool Podman.  Podman manages pods, containers, container images, and container
-volumes.")
-    (home-page "https://github.com/containers/libpod")
-    (license license:asl2.0)))
-
-(define-public conmon
-  (package
-    (name "conmon")
-    (version "0.3.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/containers/conmon.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0s23gm0cq4mylv882dr1n8bqql42674vny3z58yy77lwzmifc6id"))))
-    (build-system go-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("glib" ,glib)))
-    (arguments
-     '(#:import-path "github.com/containers/conmon"
-       #:phases (modify-phases %standard-phases
-                  (replace 'build
-                    (lambda _
-                      (with-directory-excursion "src/github.com/containers/conmon"
-                        (setenv "HOME" "/tmp")
-                        (invoke "make" "all" "CC=gcc" "GIT_COMMIT=NONE"
-                                "GIT_BRANCH=NONE"))))
-                  (delete 'check)
-                  (replace 'install
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        (with-directory-excursion "src/github.com/containers/conmon"
-                          (invoke "make" "install"
-                                  (string-append "PREFIX=" out)))))))))
-    (synopsis "OCI container runtime monitor. ")
-    (description
-     "Conmon is a monitoring program and communication tool between a container
-manager (like podman or CRI-O) and an OCI runtime (like runc or crun) for a single
-container.")
-    (home-page "https://github.com/containers/conmon")
-    (license license:asl2.0)))
-
-(define-public buildah
-  (package
-    (name "buildah")
-    (version "1.9.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/containers/buildah.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "19yf93pq4vw24h76kl32c6ryvg5fp5mixakw9c6sqydf7m74z9i8"))))
-    (build-system go-build-system)
-    (inputs `(("git" ,git)))
-    (propagated-inputs `(("runc" ,runc)
-                         ("cni-plugins" ,cni-plugins)))
-    (native-inputs `(("gpgme" ,gpgme)
-                     ("pkg-config" ,pkg-config)
-                     ("libassuan" ,libassuan)
-                     ("libseccomp" ,libseccomp)
-                     ("lvm2" ,lvm2)
-                     ("eudev" ,eudev)
-                     ("glib" ,glib)
-                     ("btrfs-progs" ,btrfs-progs)
-                     ("libostree" ,libostree)
-                     ("libselinux" ,libselinux)
-                     ("go-md2man" ,go-md2man)))
-    (arguments
-     '(#:import-path "github.com/containers/buildah"
-       #:install-source? #f
-       #:phases (modify-phases %standard-phases
-                  (replace 'build
-                    (lambda _
-                      (with-directory-excursion "src/github.com/containers/buildah"
-                        (setenv "HOME" "/tmp")
-                        (invoke "make" "binary" "docs" "GIT_COMMIT=NONE"))))
-                  (replace 'install
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        (with-directory-excursion "src/github.com/containers/buildah"
-                          (invoke "make" "install" "GIT_COMMIT=NONE"
-                                  (string-append "PREFIX=" out))) #t))))))
-    (synopsis "Tool that facilitates building OCI images")
-    (description
-     "Buildah provides a command line tool for creating and manipulating OCI
-container images.")
-    (home-page "https://github.com/containers/buildah")
-    (license license:asl2.0)))
-
-(define-public go-md2man
-  (package
-    (name "go-md2man")
-    (version "1.0.10")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/cpuguy83/go-md2man.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/cpuguy83/go-md2man"
-       #:install-source? #f
-       #:phases %standard-phases))
-    (synopsis "Converts markdown into roff (man pages)")
-    (description "Uses blackfriday to process markdown into man pages.")
-    (home-page "https://github.com/cpuguy83/go-md2man")
-    (license license:expat)))
-
-(define-public cni-plugins
-  (package
-    (name "cni-plugins")
-    (version "0.8.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/containernetworking/plugins.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "07d8knnabfjipzvcqbq7h8gd940lln934xp57nf5x31d3hpmvzws"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/containernetworking/plugins"
-       #:install-source? #f
-       #:phases (modify-phases %standard-phases
-                  (replace 'build
-                    (lambda _
-                      (with-directory-excursion "src/github.com/containernetworking/plugins"
-                        (setenv "HOME" "/tmp")
-                        (invoke "./build_linux.sh"))))
-                  (delete 'check) ;Tests currently use sudo
-                  (replace 'install
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        (copy-recursively
-                         "src/github.com/containernetworking/plugins/bin"
-                         (string-append out "/usr/lib/cni")) #t))))))
-    ;; FIXME: Enable tests
-    ;; (replace 'check
-    ;; (lambda _
-    ;; (with-directory-excursion "src/github.com/containernetworking/plugins"
-    ;; (invoke "./test_linux.sh"))))
-    (synopsis "Some standard networking plugins, maintained by the CNI team")
-    (description "A collection of CNI networking plugins.")
-    (home-page "https://github.com/containernetworking/plugins")
-    (license license:asl2.0)))
-
-(define-public slirp4netns
-  (package
-    (name "slirp4netns")
-    (version "0.4.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url
-                     "https://github.com/rootless-containers/slirp4netns.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0jai403d51w1ym7y12hq2k0hrysnc0d5kkzq8wcx7g00jk1rhkff"))))
-    (build-system gnu-build-system)
-    (arguments
-     ;; TODO: Tests currently fail
-     '(#:tests? #f))
-    (inputs `(("glib" ,glib)
-              ("libcap" ,libcap)
-              ("libseccomp" ,libseccomp)))
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("autoconf" ,autoconf)
-                     ("automake" ,automake)))
-    (synopsis "User-mode networking for unprivileged network namespaces")
-    (description
-     "slirp4netns allows connecting a network namespace to the Internet in a
-completely unprivileged way, by connecting a TAP device in a network namespace
-to the usermode TCP/IP stack (\"slirp\").")
-    (home-page "https://github.com/rootless-containers/slirp4netns")
-    (license license:gpl2+)))