From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH] gnu: slim: Move to display-managers.scm. Date: Wed, 31 Aug 2016 13:49:35 +0000 Message-ID: <87d1kpm4k0.fsf@we.make.ritual.n0.is> References: <8760qhysz9.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bf5tc-0000hs-Lt for guix-devel@gnu.org; Wed, 31 Aug 2016 09:49:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bf5ta-0007tW-8m for guix-devel@gnu.org; Wed, 31 Aug 2016 09:49:40 -0400 Received: from mithlond.libertad.in-berlin.de ([2001:67c:1400:2490::1]:60460 helo=beleriand.n0.is) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bf5tZ-0007t4-Tv for guix-devel@gnu.org; Wed, 31 Aug 2016 09:49:38 -0400 In-Reply-To: <8760qhysz9.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Marius Bakke , guix-devel@gnu.org Marius Bakke writes: > Hi, > > This change is to make room for SDDM and other display managers such as > lightdm. > > I did not add a copyright line as I consider "git mv" a trivial > operation. > > From a7e59cb154bd11e7ca04f68753982b21bef22b10 Mon Sep 17 00:00:00 2001 > From: Marius Bakke > Date: Wed, 31 Aug 2016 14:07:15 +0100 > Subject: [PATCH] gnu: slim: Move to display-managers.scm. > > * gnu/packages/display-managers.scm: New file. > * gnu/packages/slim.scm: Delete file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. > * gnu/services/xorg.scm: Likewise. > --- > gnu/local.mk | 2 +- > gnu/packages/{slim.scm => display-managers.scm} | 2 +- > gnu/services/xorg.scm | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > rename gnu/packages/{slim.scm => display-managers.scm} (98%) > > diff --git a/gnu/local.mk b/gnu/local.mk > index 5ec47fc..bc34e4a 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -96,6 +96,7 @@ GNU_SYSTEM_MODULES = \ > %D%/packages/dictionaries.scm \ > %D%/packages/dillo.scm \ > %D%/packages/disk.scm \ > + %D%/packages/display-managers.scm \ > %D%/packages/djvu.scm \ > %D%/packages/dns.scm \ > %D%/packages/docbook.scm \ > @@ -320,7 +321,6 @@ GNU_SYSTEM_MODULES = \ > %D%/packages/skarnet.scm \ > %D%/packages/skribilo.scm \ > %D%/packages/slang.scm \ > - %D%/packages/slim.scm \ > %D%/packages/smalltalk.scm \ > %D%/packages/speech.scm \ > %D%/packages/spice.scm \ > diff --git a/gnu/packages/slim.scm b/gnu/packages/display-managers.scm > similarity index 98% > rename from gnu/packages/slim.scm > rename to gnu/packages/display-managers.scm > index 2328a1a..579b149 100644 > --- a/gnu/packages/slim.scm > +++ b/gnu/packages/display-managers.scm > @@ -18,7 +18,7 @@ > ;;; You should have received a copy of the GNU General Public License > ;;; along with GNU Guix. If not, see . > > -(define-module (gnu packages slim) > +(define-module (gnu packages display-managers) > #:use-module ((guix licenses) #:prefix l:) > #:use-module (guix packages) > #:use-module (guix download) > diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm > index 905c88f..4e311de 100644 > --- a/gnu/services/xorg.scm > +++ b/gnu/services/xorg.scm > @@ -26,7 +26,7 @@ > #:use-module (gnu packages guile) > #:use-module (gnu packages xorg) > #:use-module (gnu packages gl) > - #:use-module (gnu packages slim) > + #:use-module (gnu packages display-managers) > #:use-module (gnu packages gnustep) > #:use-module (gnu packages admin) > #:use-module (gnu packages bash) > -- > 2.9.3 > I did not apply this, but it looks good to me in regards of not breaking anything: ng0@shadowwalker ~$ cd src/guix/guix-no-changes/ ng0@shadowwalker ~/src/guix/guix-no-changes$ egrep -nr "gnu packages slim" gnu/packages/slim.scm:21:(define-module (gnu packages slim) gnu/services/xorg.scm:29: #:use-module (gnu packages slim) -- ng0 For non-prism friendly talk find me on http://www.psyced.org