[PATCH 1/2] gnu: Add xlsfonts.

[PATCH 1/2] gnu: Add xlsfonts.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* gnu/packages/xorg.scm (xlsfonts): New variable.
---
 gnu/packages/xorg.scm | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b166260..4e6570a 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;;
@@ -3826,6 +3826,34 @@ running on X server.")
     (license license:x11)))
 
 
+(define-public xlsfonts
+  (package
+    (name "xlsfonts")
+    (version "1.0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://xorg/individual/app/xlsfonts-"
+             version
+             ".tar.bz2"))
+       (sha256
+        (base32
+         "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("xproto" ,xproto)
+       ("libx11" ,libx11)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://www.x.org/wiki/")
+    (synopsis "List fonts available from an X server")
+    (description
+     "xlsfonts lists fonts available from an X server via the X11 core
+protocol.")
+    (license license:x11)))
+
+
 (define-public xmodmap
   (package
     (name "xmodmap")
-- 
2.4.3

[PATCH 2/2] gnu: Add evilwm.

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

* gnu/packages/wm.scm (evilwm): New variable.
---
 gnu/packages/wm.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 9ca5b96..c1a8eb3 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -222,3 +222,54 @@ tiled on several screens.")
      "Third party tiling algorithms, configurations, and scripts to Xmonad, a
 tiling window manager for X.")
     (license bsd-3)))
+
+(define-public evilwm
+  (package
+    (name "evilwm")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.6809.org.uk/evilwm/evilwm-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0ak0yajzk3v4dg5wmaghv6acf7v02a4iw8qxmq5yw5ard8lrqn3r"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxrandr" ,libxrandr)))
+    (arguments
+     `(#:modules ((srfi srfi-26)
+                  ,@%gnu-build-system-modules)
+       #:make-flags (let ((inputs (map (cut assoc-ref %build-inputs <>)
+                                       '("libx11" "libxext" "libxrandr")))
+                          (join (lambda (proc strs)
+                                  (string-join (map proc strs) " ")))
+                          (dash-I (cut string-append "-I" <> "/include"))
+                          (dash-L (cut string-append "-L" <> "/lib")))
+                      `("desktopfilesdir=$(prefix)/share/xsessions"
+                        ,(string-append "prefix=" (assoc-ref %outputs "out"))
+                        ,(string-append "CPPFLAGS=" (join dash-I inputs))
+                        ,(string-append "LDFLAGS=" (join dash-L inputs))))
+       #:tests? #f                      ;no tests
+       #:phases (modify-phases %standard-phases
+                  (delete 'configure)                 ;no configure script
+                  (add-before
+                   'build 'provide-better-default-font
+                   (lambda _
+                     ;; The "fixed" font is contained in the set of fonts
+                     ;; installed with the default xorg-server service, so use
+                     ;; it as the default instead.
+                     (substitute* "evilwm.h"
+                       (("^#define DEF_FONT[[:space:]]*\"variable\"")
+                        "#define DEF_FONT \"fixed\""))
+                     #t)))))
+    (home-page "http://www.6809.org.uk/evilwm/")
+    (synopsis "Minimalist window manager for the X Window System")
+    (description
+     "evilwm is a minimalist window manager based on aewm, extended to feature
+many keyboard controls with repositioning and maximize toggles, solid window
+drags, snap-to-border support, and virtual desktops.")
+    (license (fsf-free "file:///README"))))
-- 
2.4.3

Re: [PATCH 1/2] gnu: Add xlsfonts.

[Ludovic Courtès]

ericbavier@openmailbox.org skribis:

> From: Eric Bavier <bavier@member.fsf.org>
>
> * gnu/packages/xorg.scm (xlsfonts): New variable.

Sure, thanks!

Ludo'.

Re: [PATCH 2/2] gnu: Add evilwm.

[Ludovic Courtès]

ericbavier@openmailbox.org skribis:

> From: Eric Bavier <bavier@member.fsf.org>
>
> * gnu/packages/wm.scm (evilwm): New variable.

[...]

> +                   'build 'provide-better-default-font
> +                   (lambda _
> +                     ;; The "fixed" font is contained in the set of fonts
> +                     ;; installed with the default xorg-server service, so use
> +                     ;; it as the default instead.
> +                     (substitute* "evilwm.h"
> +                       (("^#define DEF_FONT[[:space:]]*\"variable\"")
> +                        "#define DEF_FONT \"fixed\""))

What about adding the “variable” font by default in (gnu services xorg)
instead?

> +    (license (fsf-free "file:///README"))))

Since ‘fsf-free’ is a catch-all thing, could you add a comment
explaining in one line what kind of license this is?

Thank you,
Ludo’.

Re: [PATCH 2/2] gnu: Add evilwm.

[Eric Bavier]

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

On Fri, 16 Oct 2015 10:37:43 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> ericbavier@openmailbox.org skribis:
> 
> > From: Eric Bavier <bavier@member.fsf.org>
> >
> > * gnu/packages/wm.scm (evilwm): New variable.
> 
> [...]
> 
> > +                   'build 'provide-better-default-font
> > +                   (lambda _
> > +                     ;; The "fixed" font is contained in the set of fonts
> > +                     ;; installed with the default xorg-server service, so use
> > +                     ;; it as the default instead.
> > +                     (substitute* "evilwm.h"
> > +                       (("^#define DEF_FONT[[:space:]]*\"variable\"")
> > +                        "#define DEF_FONT \"fixed\""))
> 
> What about adding the “variable” font by default in (gnu services xorg)
> instead?

The attached patches:

0002) patch our font-alias package so that the xserver will honor its
alias definitions.
0003) Add font-alias directories to the default FontPath in our
xorg-server service.
0004) Amends the previous patch to remove the change to evilwm's default
font.

> 
> > +    (license (fsf-free "file:///README"))))
> 
> Since ‘fsf-free’ is a catch-all thing, could you add a comment
> explaining in one line what kind of license this is?

Upon closer reading of the README, I've updated the license field to
'(x11-style "file:///README")'.  Of course, second opinions welcome,
especially since http://directory.fsf.org/wiki/Evilwm claims both
"Other" and "GPLv2orlater" licenses, and
http://directory.fsf.org/wiki/Aewm which evilwm is based on claims the
"Expat" license.

`~Eric

[-- Attachment #2: 0002-font-alias-Install-dummy-fonts.dir-files.patch --]
[-- Type: application/octet-stream, Size: 1764 bytes --]

From 024a556bdc82a569b6c07873df221ae7e50f1fb0 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Mon, 19 Oct 2015 06:44:23 -0500
Subject: [PATCH 2/4] font-alias: Install dummy fonts.dir files.

* gnu/packages/xorg.scm (font-alias)[arguments]: New 'install-fonts-dir'
  phase.
---
 gnu/packages/xorg.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4e6570a..d96a7bf 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -413,6 +413,23 @@ provided.")
             "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after
+                   'install 'install-fonts-dir
+                   ;; The X font server will not add directories to the font
+                   ;; path unless they contain a "fonts.dir" file, so add some
+                   ;; dummy files.
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     (let ((out (assoc-ref outputs "out")))
+                       (for-each (lambda (d)
+                                   (call-with-output-file
+                                       (string-append out "/share/fonts/X11"
+                                                      "/" d "/fonts.dir")
+                                     (lambda (p)
+                                       (format p "0~%"))))
+                                 '("75dpi" "100dpi" "misc" "cyrillic"))
+                       #t))))))
     (home-page "http://www.x.org/wiki/")
     (synopsis "Xorg font aliases")
     (description
-- 
2.4.3


[-- Attachment #3: 0003-services-xorg-Include-font-alias-in-default-FontPath.patch --]
[-- Type: application/octet-stream, Size: 1053 bytes --]

From d5446a060f7ffe6d419d64bf5c3a0a51736a47d0 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Mon, 19 Oct 2015 06:45:31 -0500
Subject: [PATCH 3/4] services: xorg: Include font-alias in default FontPath.

* gnu/services/xorg.scm (xorg-configuration-file): Add font-alias directories
  to xserver.conf FontPath.
---
 gnu/services/xorg.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 9ee8817..7e90665 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -89,6 +89,10 @@ EndSection"))
 
   (apply text-file* "xserver.conf" "
 Section \"Files\"
+  FontPath \"" font-alias "/share/fonts/X11/75dpi\"
+  FontPath \"" font-alias "/share/fonts/X11/100dpi\"
+  FontPath \"" font-alias "/share/fonts/X11/misc\"
+  FontPath \"" font-alias "/share/fonts/X11/cyrillic\"
   FontPath \"" font-adobe75dpi "/share/fonts/X11/75dpi\"
   ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
   ModulePath \"" xf86-video-fbdev "/lib/xorg/modules/drivers\"
-- 
2.4.3


[-- Attachment #4: 0004-gnu-Add-evilwm.patch --]
[-- Type: application/octet-stream, Size: 2544 bytes --]

From 45c524710742550013a8513b641e8d488806f7c9 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 15 Oct 2015 17:34:26 -0500
Subject: [PATCH 4/4] gnu: Add evilwm.

* gnu/packages/wm.scm (evilwm): New variable.
---
 gnu/packages/wm.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 9ca5b96..8fe0d6f 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -222,3 +222,44 @@ tiled on several screens.")
      "Third party tiling algorithms, configurations, and scripts to Xmonad, a
 tiling window manager for X.")
     (license bsd-3)))
+
+(define-public evilwm
+  (package
+    (name "evilwm")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.6809.org.uk/evilwm/evilwm-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0ak0yajzk3v4dg5wmaghv6acf7v02a4iw8qxmq5yw5ard8lrqn3r"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxrandr" ,libxrandr)))
+    (arguments
+     `(#:modules ((srfi srfi-26)
+                  ,@%gnu-build-system-modules)
+       #:make-flags (let ((inputs (map (cut assoc-ref %build-inputs <>)
+                                       '("libx11" "libxext" "libxrandr")))
+                          (join (lambda (proc strs)
+                                  (string-join (map proc strs) " ")))
+                          (dash-I (cut string-append "-I" <> "/include"))
+                          (dash-L (cut string-append "-L" <> "/lib")))
+                      `("desktopfilesdir=$(prefix)/share/xsessions"
+                        ,(string-append "prefix=" (assoc-ref %outputs "out"))
+                        ,(string-append "CPPFLAGS=" (join dash-I inputs))
+                        ,(string-append "LDFLAGS=" (join dash-L inputs))))
+       #:tests? #f                      ;no tests
+       #:phases (modify-phases %standard-phases
+                  (delete 'configure)))) ;no configure script
+    (home-page "http://www.6809.org.uk/evilwm/")
+    (synopsis "Minimalist window manager for the X Window System")
+    (description
+     "evilwm is a minimalist window manager based on aewm, extended to feature
+many keyboard controls with repositioning and maximize toggles, solid window
+drags, snap-to-border support, and virtual desktops.")
+    (license (x11-style "file:///README"))))
-- 
2.4.3

Re: [PATCH 2/2] gnu: Add evilwm.

[Ludovic Courtès]

Eric Bavier <ericbavier@openmailbox.org> skribis:

> On Fri, 16 Oct 2015 10:37:43 +0200
> ludo@gnu.org (Ludovic Courtès) wrote:

[...]

>> Since ‘fsf-free’ is a catch-all thing, could you add a comment
>> explaining in one line what kind of license this is?
>
> Upon closer reading of the README, I've updated the license field to
> '(x11-style "file:///README")'.  Of course, second opinions welcome,
> especially since http://directory.fsf.org/wiki/Evilwm claims both
> "Other" and "GPLv2orlater" licenses, and
> http://directory.fsf.org/wiki/Aewm which evilwm is based on claims the
> "Expat" license.

On a cursory look at ‘README’, x11-style sounds right to me.

> From 024a556bdc82a569b6c07873df221ae7e50f1fb0 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Mon, 19 Oct 2015 06:44:23 -0500
> Subject: [PATCH 2/4] font-alias: Install dummy fonts.dir files.
>
> * gnu/packages/xorg.scm (font-alias)[arguments]: New 'install-fonts-dir'
>   phase.

Good catch!  LGTM.

> +                   'install 'install-fonts-dir
> +                   ;; The X font server will not add directories to the font
> +                   ;; path unless they contain a "fonts.dir" file, so add some
> +                   ;; dummy files.
> +                   (lambda* (#:key outputs #:allow-other-keys)
> +                     (let ((out (assoc-ref outputs "out")))
> +                       (for-each (lambda (d)
> +                                   (call-with-output-file
> +                                       (string-append out "/share/fonts/X11"
> +                                                      "/" d "/fonts.dir")
> +                                     (lambda (p)
> +                                       (format p "0~%"))))
> +                                 '("75dpi" "100dpi" "misc" "cyrillic"))

So how did you settle on "0~%"?  :-)

> From d5446a060f7ffe6d419d64bf5c3a0a51736a47d0 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Mon, 19 Oct 2015 06:45:31 -0500
> Subject: [PATCH 3/4] services: xorg: Include font-alias in default FontPath.
>
> * gnu/services/xorg.scm (xorg-configuration-file): Add font-alias directories
>   to xserver.conf FontPath.

OK.

> From 45c524710742550013a8513b641e8d488806f7c9 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Thu, 15 Oct 2015 17:34:26 -0500
> Subject: [PATCH 4/4] gnu: Add evilwm.
>
> * gnu/packages/wm.scm (evilwm): New variable.

[...]

> +    (arguments
> +     `(#:modules ((srfi srfi-26)
> +                  ,@%gnu-build-system-modules)

Note that %GNU-BUILD-SYSTEM-MODULES is the set of modules *imported* in
the build environment (inputs of the derivation), not the set of modules
visible in the build script.  See ‘%default-modules’
vs. ‘%gnu-build-system-modules’ in (guix build-system gnu) for the
difference.

So it should rather be:

  #:modules ((srfi srfi-26)
             (guix build utils)
             (guix build gnu-build-system))

In practice it probably won’t make any difference.

Otherwise LGTM.

Thanks!

Ludo’.

Re: [PATCH 2/2] gnu: Add evilwm.

[Eric Bavier]

On 2015-10-20 02:56, ludo@gnu.org wrote:
> Eric Bavier <ericbavier@openmailbox.org> skribis:
> 
>> On Fri, 16 Oct 2015 10:37:43 +0200
>> ludo@gnu.org (Ludovic Courtès) wrote:
[...]
>> +                   'install 'install-fonts-dir
>> +                   ;; The X font server will not add directories to 
>> the font
>> +                   ;; path unless they contain a "fonts.dir" file, so 
>> add some
>> +                   ;; dummy files.
>> +                   (lambda* (#:key outputs #:allow-other-keys)
>> +                     (let ((out (assoc-ref outputs "out")))
>> +                       (for-each (lambda (d)
>> +                                   (call-with-output-file
>> +                                       (string-append out 
>> "/share/fonts/X11"
>> +                                                      "/" d 
>> "/fonts.dir")
>> +                                     (lambda (p)
>> +                                       (format p "0~%"))))
>> +                                 '("75dpi" "100dpi" "misc" 
>> "cyrillic"))
> 
> So how did you settle on "0~%"?  :-)

I ran 'mkfontdir' on an empty directory, and the "fonts.dir" file it 
wrote
contained just a "0" on a line of its own.  I'm not sure whether things 
would
work with just an empty file.

>> From 45c524710742550013a8513b641e8d488806f7c9 Mon Sep 17 00:00:00 2001
>> From: Eric Bavier <bavier@member.fsf.org>
>> Date: Thu, 15 Oct 2015 17:34:26 -0500
>> Subject: [PATCH 4/4] gnu: Add evilwm.
>> 
>> * gnu/packages/wm.scm (evilwm): New variable.
> 
> [...]
> 
>> +    (arguments
>> +     `(#:modules ((srfi srfi-26)
>> +                  ,@%gnu-build-system-modules)
> 
> Note that %GNU-BUILD-SYSTEM-MODULES is the set of modules *imported* in
> the build environment (inputs of the derivation), not the set of 
> modules
> visible in the build script.  See ‘%default-modules’
> vs. ‘%gnu-build-system-modules’ in (guix build-system gnu) for the
> difference.

Thanks for the pointer.  I saw some other packages using 
%gnu-build-system-modules
and wasn't aware of the subtleties.

> So it should rather be:
> 
>   #:modules ((srfi srfi-26)
>              (guix build utils)
>              (guix build gnu-build-system))

I'll use that then.

> In practice it probably won’t make any difference.

I don't mind being pedantic. :)

> Otherwise LGTM.

Great!  Thanks for the reviews.  I'll push with those changes.

-- 
`~Eric