diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
| commit | 8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e (patch) | |
| tree | 6fa0f8ba32b83a996625bc188903ccebfb7e7c2c /gnu/services | |
| parent | 5d9e2187929ed7e8d46ec3cb3174fd78c1846360 (diff) | |
| parent | 229f4fa9522fb56b014ee9c0d8111e8fb6da764d (diff) | |
| download | guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/backup.scm
gnu/packages/emacs-xyz.scm
gnu/packages/guile.scm
gnu/packages/lisp.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/docker.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 04f9127346..d6dc792821 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org> +;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -94,7 +95,7 @@ loop-back communications.") file-system-/sys/fs/cgroup/cpuset file-system-/sys/fs/cgroup/devices file-system-/sys/fs/cgroup/memory - ; TODO: file-system-/sys/fs/cgroup/pids + file-system-/sys/fs/cgroup/pids networking udev)) (start #~(make-forkexec-constructor |