[PATCH] gnu: slim: Move to display-managers.scm.

[PATCH] gnu: slim: Move to display-managers.scm.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

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.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-slim-Move-to-display-managers.scm.patch --]
[-- Type: text/x-patch, Size: 2419 bytes --]

From a7e59cb154bd11e7ca04f68753982b21bef22b10 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
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 <http://www.gnu.org/licenses/>.
 
-(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

Re: [PATCH] gnu: slim: Move to display-managers.scm.

[David Craven]

LGTM.

Are you packaging lightdm? I started packaging lightdm before sddm.
But then I realized that it doesn't support (and probably never will)
wayland sessions. Looks to me like another we are ubuntu and we are
doing our own thing kind of project... ;-)

Re: [PATCH] gnu: slim: Move to display-managers.scm.

[ng0]

Marius Bakke <mbakke@fastmail.com> 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 <mbakke@fastmail.com>
> 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 <http://www.gnu.org/licenses/>.
>  
> -(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

Re: [PATCH] gnu: slim: Move to display-managers.scm.

[Marius Bakke]

David Craven <david@craven.ch> writes:

> Are you packaging lightdm? I started packaging lightdm before sddm.
> But then I realized that it doesn't support (and probably never will)
> wayland sessions. Looks to me like another we are ubuntu and we are
> doing our own thing kind of project... ;-)

No immediate plans to package lightdm, but I'm sure it will get in
eventually. It offers some nice features such as light-locker and
multiple sessions, but I could not get either working properly..

Perhaps when I finally make the jump to GuixSD :)

~marius

Re: [PATCH] gnu: slim: Move to display-managers.scm.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> LGTM.

+1, can you push?

Thanks,
Ludo’.

Re: [PATCH] gnu: slim: Move to display-managers.scm.

[David Craven]

Pushed as 5fd66a37d58aa13091134d5e6e5f8c62f404ebfe

I thought I forgot something. I didn't add a signed-of-by line, but
it's signed with my gpg key, so that will have to do for this one...