summaryrefslogtreecommitdiff
path: root/gnu/services/base.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2019-09-06 19:35:08 -0400
committerMark H Weaver <mhw@netris.org>2019-09-06 19:35:08 -0400
commit3fe53f49a718468bc086fa7d41740505d407e3ba (patch)
tree004b010bc768446924e20f681f7c9cdd245279c7 /gnu/services/base.scm
parenta35f153d54a2e571c88386424c7846b2d4b59689 (diff)
downloadguix-patches-3fe53f49a718468bc086fa7d41740505d407e3ba.tar
guix-patches-3fe53f49a718468bc086fa7d41740505d407e3ba.tar.gz
Revert "services: Add ‘/usr/bin/env’ special file."
This reverts commit 3b38bf141a464e1bb370af7d2b2651d1efb29781. The Guix project discussed this years ago and decided against including /usr/bin/env. That decision should not be reversed without a wider discussion.
Diffstat (limited to 'gnu/services/base.scm')
-rw-r--r--gnu/services/base.scm9
1 files changed, 3 insertions, 6 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 97c53eeaf3..dcb7278f0f 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -8,7 +8,6 @@
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
;;;
;;; This file is part of GNU Guix.
@@ -42,9 +41,9 @@
#:use-module (gnu packages admin)
#:use-module ((gnu packages linux)
#:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
- #:use-module (gnu packages bash)
#:use-module ((gnu packages base)
- #:select (canonical-package coreutils glibc glibc-utf8-locales))
+ #:select (canonical-package glibc glibc-utf8-locales))
+ #:use-module (gnu packages bash)
#:use-module (gnu packages package-management)
#:use-module ((gnu packages gnupg) #:select (guile-gcrypt))
#:use-module (gnu packages linux)
@@ -2426,8 +2425,6 @@ to handle."
(service special-files-service-type
`(("/bin/sh" ,(file-append (canonical-package bash)
- "/bin/sh"))
- ("/usr/bin/env" ,(file-append (canonical-package coreutils)
- "/usr/bin/env"))))))
+ "/bin/sh"))))))
;;; base.scm ends here