03/03: services: guix: Provide Guix via 'profile-service-type'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 9a8b9eb8de74280dae0997c4449501f9f2720d30
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jan 27 15:40:29 2016 +0100

    services: guix: Provide Guix via 'profile-service-type'.
    
    * gnu/services/base.scm (guix-service-type): Extend
    PROFILE-SERVICE-TYPE.
    * gnu/system.scm (%base-packages): Remove GUIX.
---
 gnu/services/base.scm |    6 ++++--
 gnu/system.scm        |    1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 25143c8..0399c00 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015 Alex Kost <address@hidden>
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Sou Bunnbu <address@hidden>
@@ -946,7 +946,9 @@ failed to register hydra.gnu.org public key: ~a~%" 
status))))))))
    (extensions
     (list (service-extension dmd-root-service-type guix-dmd-service)
           (service-extension account-service-type guix-accounts)
-          (service-extension activation-service-type guix-activation)))))
+          (service-extension activation-service-type guix-activation)
+          (service-extension profile-service-type
+                             (compose list guix-configuration-guix))))))
 
 (define* (guix-service #:optional (config %default-guix-configuration))
   "Return a service that runs the Guix build daemon according to
diff --git a/gnu/system.scm b/gnu/system.scm
index 4072e31..0245184 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -353,7 +353,6 @@ explicitly appear in OS."
   ;; Default set of packages globally visible.  It should include anything
   ;; required for basic administrator tasks.
   (cons* procps psmisc which less zile nano
-         guix
          lsof                                 ;for Guix's 'list-runtime-roots'
          pciutils usbutils
          util-linux inetutils isc-dhcp