summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-01-27 15:40:29 +0100
committerLudovic Courtès <ludo@gnu.org>2016-01-27 15:48:35 +0100
commit9a8b9eb8de74280dae0997c4449501f9f2720d30 (patch)
treed6ef63115d5358f2b591077026cf1ed705ed1cea /gnu
parentc273d81bfa560076414e7e221505f25c91232860 (diff)
downloadguix-9a8b9eb8de74280dae0997c4449501f9f2720d30.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/base.scm6
-rw-r--r--gnu/system.scm1
2 files changed, 4 insertions, 3 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 25143c80a6..0399c0049d 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 <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
@@ -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 4072e317e9..024518445d 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