guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Revert "services: Add ‘/usr/bin/env’ special file."


From: guix-commits
Subject: 01/01: Revert "services: Add ‘/usr/bin/env’ special file."
Date: Fri, 6 Sep 2019 19:38:45 -0400 (EDT)

mhw pushed a commit to branch master
in repository guix.

commit 3fe53f49a718468bc086fa7d41740505d407e3ba
Author: Mark H Weaver <address@hidden>
Date:   Fri Sep 6 19:35:08 2019 -0400

    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.
---
 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 97c53ee..dcb7278 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -8,7 +8,6 @@
 ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2018 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2019 Efraim Flashner <address@hidden>
-;;; Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2019 John Soo <address@hidden>
 ;;;
 ;;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]