From 9a8b9eb8de74280dae0997c4449501f9f2720d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 27 Jan 2016 15:40:29 +0100 Subject: [PATCH] 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 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 +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu @@ -946,7 +946,9 @@ (define guix-service-type (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 @@ (define %base-packages ;; 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