From 3fe53f49a718468bc086fa7d41740505d407e3ba Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 6 Sep 2019 19:35:08 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"services:=20Add=20=E2=80=98/usr/bin/e?= =?UTF-8?q?nv=E2=80=99=20special=20file."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- gnu/services/base.scm | 9 +++------ 1 file 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 ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Efraim Flashner -;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 John Soo ;;; ;;; This file is part of GNU Guix. @@ -42,9 +41,9 @@ (define-module (gnu services base) #: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 @@ (define %base-services (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