[PATCH] Add st

[PATCH] Add st

[amirouche]

This patch st terminal emulator from suckless.

This is my first patch!

This installs flawlessly except:

- `tic -s terminfo -s info` which fails because it try to install in an 
unknown home directory. In Gentoo they install it in /usr/share/terminfo 
[1]. A added a patch to avoid this issue. One has to export TERM=xterm 
to make it possible to use terminal applications.

- The default config.def.h use Liberation font, this is ok. However it's 
might be better to activate antialias and autohint?


[1] 
https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-terms/st/st-0.5.ebuild?view=markup

Re: [PATCH] Add st

[amirouche]

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

With the patch this time ^^'

On 2015-06-09 13:04, amirouche@hypermove.net wrote:
> This patch st terminal emulator from suckless.
> 
> This is my first patch!
> 
> This installs flawlessly except:
> 
> - `tic -s terminfo -s info` which fails because it try to install in
> an unknown home directory. In Gentoo they install it in
> /usr/share/terminfo [1]. A added a patch to avoid this issue. One has
> to export TERM=xterm to make it possible to use terminal applications.
> 
> - The default config.def.h use Liberation font, this is ok. However
> it's might be better to activate antialias and autohint?
> 
> 
> [1]
> https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-terms/st/st-0.5.ebuild?view=markup

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-add-st.patch --]
[-- Type: text/x-diff; name=0001-gnu-add-st.patch, Size: 3677 bytes --]

From 385f7129b405d136cbbb7dbffa35bf6f62cffc93 Mon Sep 17 00:00:00 2001
From: amz3 <amirouche@hypermove.net>
Date: Sun, 7 Jun 2015 19:04:28 +0200
Subject: [PATCH] gnu: add st.

* gnu/packages/dwm.scm (st): New variable.
* gnu/packages/patches/st-0.5-do-not-install-terminfo.patch: New file.
---
 gnu/packages/dwm.scm                               | 50 +++++++++++++++++++++-
 .../patches/st-0.5-do-not-install-terminfo.patch   | 13 ++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/st-0.5-do-not-install-terminfo.patch

diff --git a/gnu/packages/dwm.scm b/gnu/packages/dwm.scm
index 98fa122..b82297f 100644
--- a/gnu/packages/dwm.scm
+++ b/gnu/packages/dwm.scm
@@ -22,7 +22,11 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fonts)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pkg-config)
+  #:use-module ((gnu packages fontutils) #:prefix font-utils:))
 
 (define-public dwm
   (package
@@ -139,3 +143,47 @@ numbers of user-defined menu items efficiently.")
     (description
      "Simple X session lock with trivial feedback on password entry.")
     (license x11)))
+
+
+(define-public st
+  (package
+    (name "st")
+    (version "0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://dl.suckless.org/st/st-"
+                           version ".tar.gz"))
+       (patches (list (search-patch "st-0.5-do-not-install-terminfo.patch")))
+       (sha256
+        (base32
+         "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; no tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:phases
+       (alist-delete 'configure %standard-phases)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxft" ,libxft)
+       ("libxcomposite" ,libxcomposite)
+       ("compositeproto" ,compositeproto)
+       ("libxext" ,libxext)
+       ("xextproto" ,xextproto)
+       ("libxrender" ,libxrender)
+       ("fontconfig" ,font-utils:fontconfig)
+       ("freetype" ,font-utils:freetype)
+       ("font-liberation5" ,font-liberation)))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("ncurses" ,ncurses)))
+    (home-page "http://st.suckless.org/")
+    (synopsis "Simple terminal emulator")
+    (description
+     "Xterm is bloated and unmaintainable.  It has over 65K lines of code and
+      emulates obscure and obsolete terminals you will never need.  The popular
+      alternative, rxvt has only 32K lines of code.  This is just too much for
+      something as simple as a terminal emulator; it’s yet another example of
+      code complexity.  st fix that.")
+    (license x11)))
diff --git a/gnu/packages/patches/st-0.5-do-not-install-terminfo.patch b/gnu/packages/patches/st-0.5-do-not-install-terminfo.patch
new file mode 100644
index 0000000..089c423
--- /dev/null
+++ b/gnu/packages/patches/st-0.5-do-not-install-terminfo.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 6158ab2..93cb684 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,8 +48,6 @@ install: all
+ 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+ 	@sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
+ 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
+-	@echo Please see the README file regarding the terminfo entry of st.
+-	@tic -s st.info
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
-- 
2.2.1

Re: [PATCH] Add st

[Andreas Enge]

Hello,

thanks for the submission! Just a partial review:

On Tue, Jun 09, 2015 at 03:07:55PM +0200, amirouche@hypermove.net wrote:
> +       ("font-liberation5" ,font-liberation)))

Typo? Drop "5"

> +    (description
> +     "Xterm is bloated and unmaintainable.  It has over 65K lines of code and

Please write a more neutral description. Something like
"St implements a simple and light-weight terminal emulator.  It implements
256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
antialiased fonts (using fontconfig), fallback fonts, resizing,
and line drawing."
It is nicer to write what a programme does well than to complain about
what others do poorly.

Andreas

Re: [PATCH] Add st

[amirouche]

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

On 2015-06-09 16:22, Andreas Enge wrote:
> Hello,
> 
> thanks for the submission! Just a partial review:
> 
> On Tue, Jun 09, 2015 at 03:07:55PM +0200, amirouche@hypermove.net 
> wrote:
>> +       ("font-liberation5" ,font-liberation)))
> 
> Typo? Drop "5"
> 
>> +    (description
>> +     "Xterm is bloated and unmaintainable.  It has over 65K lines of 
>> code and
> 
> Please write a more neutral description. Something like
> "St implements a simple and light-weight terminal emulator.  It 
> implements
> 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
> antialiased fonts (using fontconfig), fallback fonts, resizing,
> and line drawing."
> It is nicer to write what a programme does well than to complain about
> what others do poorly.

Agreed. I created a new patch with the changes you requested and I've 
run: ./pre-inst-env guix lint st.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-add-st.patch --]
[-- Type: text/x-diff; name=0001-gnu-add-st.patch, Size: 3676 bytes --]

From 24e374cd99adb8efc1d6a9c5ba0d7cfb1f71828f Mon Sep 17 00:00:00 2001
From: amz3 <amirouche@hypermove.net>
Date: Sun, 7 Jun 2015 19:04:28 +0200
Subject: [PATCH] gnu: add st.

* gnu/packages/dwm.scm (st): New variable.
* gnu/packages/patches/st-0.5-do-not-install-terminfo.patch: New file.
---
 gnu/packages/dwm.scm                               | 50 +++++++++++++++++++++-
 .../patches/st-0.5-do-not-install-terminfo.patch   | 13 ++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/st-0.5-do-not-install-terminfo.patch

diff --git a/gnu/packages/dwm.scm b/gnu/packages/dwm.scm
index 98fa122..8ce078b 100644
--- a/gnu/packages/dwm.scm
+++ b/gnu/packages/dwm.scm
@@ -22,7 +22,11 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fonts)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pkg-config)
+  #:use-module ((gnu packages fontutils) #:prefix font-utils:))
 
 (define-public dwm
   (package
@@ -139,3 +143,47 @@ numbers of user-defined menu items efficiently.")
     (description
      "Simple X session lock with trivial feedback on password entry.")
     (license x11)))
+
+
+(define-public st
+  (package
+    (name "st")
+    (version "0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://dl.suckless.org/st/st-"
+                           version ".tar.gz"))
+       (patches (list (search-patch "st-0.5-do-not-install-terminfo.patch")))
+       (sha256
+        (base32
+         "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; no tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:phases
+       (alist-delete 'configure %standard-phases)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxft" ,libxft)
+       ("libxcomposite" ,libxcomposite)
+       ("compositeproto" ,compositeproto)
+       ("libxext" ,libxext)
+       ("xextproto" ,xextproto)
+       ("libxrender" ,libxrender)
+       ("fontconfig" ,font-utils:fontconfig)
+       ("freetype" ,font-utils:freetype)
+       ("font-liberation" ,font-liberation)))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("ncurses" ,ncurses)))
+    (home-page "http://st.suckless.org/")
+    (synopsis "Simple terminal emulator")
+    (description
+     "Xterm is bloated and unmaintainable.  It has over 65K lines of code and
+      emulates obscure and obsolete terminals you will never need.  The popular
+      alternative, rxvt has only 32K lines of code.  This is just too much for
+      something as simple as a terminal emulator; it’s yet another example of
+      code complexity.  st fix that.")
+    (license x11)))
diff --git a/gnu/packages/patches/st-0.5-do-not-install-terminfo.patch b/gnu/packages/patches/st-0.5-do-not-install-terminfo.patch
new file mode 100644
index 0000000..089c423
--- /dev/null
+++ b/gnu/packages/patches/st-0.5-do-not-install-terminfo.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 6158ab2..93cb684 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,8 +48,6 @@ install: all
+ 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+ 	@sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
+ 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
+-	@echo Please see the README file regarding the terminfo entry of st.
+-	@tic -s st.info
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
-- 
2.2.1

Re: [PATCH] Add st

[Mark H Weaver]

amirouche@hypermove.net writes:

> On 2015-06-09 16:22, Andreas Enge wrote:
>>> +    (description
>>> +     "Xterm is bloated and unmaintainable.  It has over 65K lines
>>> of code and
>>
>> Please write a more neutral description. Something like
>> "St implements a simple and light-weight terminal emulator.  It
>> implements
>> 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
>> antialiased fonts (using fontconfig), fallback fonts, resizing,
>> and line drawing."
>> It is nicer to write what a programme does well than to complain about
>> what others do poorly.
>
> Agreed. I created a new patch with the changes you requested and I've
> run: ./pre-inst-env guix lint st.

Did you change the description at all?  At first glance, it looks the
same as before.  It should be more neutral, as Andreas said.

> From 24e374cd99adb8efc1d6a9c5ba0d7cfb1f71828f Mon Sep 17 00:00:00 2001
> From: amz3 <amirouche@hypermove.net>
> Date: Sun, 7 Jun 2015 19:04:28 +0200
> Subject: [PATCH] gnu: add st.
>
> * gnu/packages/dwm.scm (st): New variable.
> * gnu/packages/patches/st-0.5-do-not-install-terminfo.patch: New file.

You would need to add this patch to 'dist_patch_DATA' in gnu-system.am
as well, but in this case I think it's better to make this change in a
custom phase using 'substitute*'.  The reason is that if the user
requests the source code using 'guix build -S st', it should probably
not include that change, which is guix-specific.

It could be something like this: (untested)

--8<---------------cut here---------------start------------->8---
       #:phases
       (modify-phases %standard-phases
         (delete 'configure)
         (add-after 'unpack 'inhibit-terminfo-install
                    (lambda _
                      (substitute* "Makefile"
                        (("\t@tic -s st.info") ""))
                      #t)))))
--8<---------------cut here---------------end--------------->8---

Also, we should probably rename dwm.scm to suckless.scm.
GNU_SYSTEM_MODULES in gnu-system.am should be updated accordingly,
keeping it sorted.

> diff --git a/gnu/packages/dwm.scm b/gnu/packages/dwm.scm
> index 98fa122..8ce078b 100644
> --- a/gnu/packages/dwm.scm
> +++ b/gnu/packages/dwm.scm

Please add a copyright line for yourself to the top of the file.

> @@ -22,7 +22,11 @@
>    #:use-module (guix download)
>    #:use-module (guix build-system gnu)
>    #:use-module (gnu packages)
> -  #:use-module (gnu packages xorg))
> +  #:use-module (gnu packages xorg)
> +  #:use-module (gnu packages fonts)
> +  #:use-module (gnu packages ncurses)
> +  #:use-module (gnu packages pkg-config)
> +  #:use-module ((gnu packages fontutils) #:prefix font-utils:))

Instead of adding a prefix for (gnu package fontutils), better to add a
'license:' prefix for (guix licenses) and update the 'license' fields of
the existing packages accordingly.

>  
>  (define-public dwm
>    (package
> @@ -139,3 +143,47 @@ numbers of user-defined menu items efficiently.")
>      (description
>       "Simple X session lock with trivial feedback on password entry.")
>      (license x11)))
> +
> +
> +(define-public st

Just one blank line between packages please.

> +  (package
> +    (name "st")
> +    (version "0.5")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "http://dl.suckless.org/st/st-"
> +                           version ".tar.gz"))
> +       (patches (list (search-patch "st-0.5-do-not-install-terminfo.patch")))
> +       (sha256
> +        (base32
> +         "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     '(#:tests? #f ; no tests
> +       #:make-flags (list "CC=gcc"
> +                          (string-append "PREFIX=" %output))
> +       #:phases
> +       (alist-delete 'configure %standard-phases)))
> +    (inputs
> +     `(("libx11" ,libx11)
> +       ("libxft" ,libxft)
> +       ("libxcomposite" ,libxcomposite)
> +       ("compositeproto" ,compositeproto)
> +       ("libxext" ,libxext)
> +       ("xextproto" ,xextproto)
> +       ("libxrender" ,libxrender)
> +       ("fontconfig" ,font-utils:fontconfig)
> +       ("freetype" ,font-utils:freetype)
> +       ("font-liberation" ,font-liberation)))
> +    (native-inputs `(("pkg-config" ,pkg-config)
> +                     ("ncurses" ,ncurses)))

Is ncurses really needed here as a native-input?  If 'st' needs to be
linked to it for use at run time, then it should be a normal input.  It
should only be a native-input if it's needed at build time.  That would
be surprising to me, since the build process within guix-daemon is
obviously non-interactive.

> +    (home-page "http://st.suckless.org/")
> +    (synopsis "Simple terminal emulator")
> +    (description
> +     "Xterm is bloated and unmaintainable.  It has over 65K lines of code and
> +      emulates obscure and obsolete terminals you will never need.  The popular
> +      alternative, rxvt has only 32K lines of code.  This is just too much for
> +      something as simple as a terminal emulator; it's yet another example of
> +      code complexity.  st fix that.")

See above.

Can you send an updated patch?

     Thanks!
       Mark

Re: [PATCH] Add st

[amirouche]

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

I attached two patches. The second patch is to rename dwm.scm

On 2015-06-12 00:15, Mark H Weaver wrote:
> amirouche@hypermove.net writes:
> 
>> On 2015-06-09 16:22, Andreas Enge wrote:
>>>> +    (description
>>>> +     "Xterm is bloated and unmaintainable.  It has over 65K lines
>>>> of code and
>>> 
>>> Please write a more neutral description. Something like
>>> "St implements a simple and light-weight terminal emulator.  It
>>> implements
>>> 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
>>> antialiased fonts (using fontconfig), fallback fonts, resizing,
>>> and line drawing."
>>> It is nicer to write what a programme does well than to complain 
>>> about
>>> what others do poorly.
>> 
>> Agreed. I created a new patch with the changes you requested and I've
>> run: ./pre-inst-env guix lint st.
> 
> Did you change the description at all?  At first glance, it looks the
> same as before.  It should be more neutral, as Andreas said.

Sorry. I did not commit before generating the patch.

> 
>> From 24e374cd99adb8efc1d6a9c5ba0d7cfb1f71828f Mon Sep 17 00:00:00 2001
>> From: amz3 <amirouche@hypermove.net>
>> Date: Sun, 7 Jun 2015 19:04:28 +0200
>> Subject: [PATCH] gnu: add st.
>> 
>> * gnu/packages/dwm.scm (st): New variable.
>> * gnu/packages/patches/st-0.5-do-not-install-terminfo.patch: New file.
> 
> You would need to add this patch to 'dist_patch_DATA' in gnu-system.am
> as well, but in this case I think it's better to make this change in a
> custom phase using 'substitute*'.  The reason is that if the user
> requests the source code using 'guix build -S st', it should probably
> not include that change, which is guix-specific.
> 
> It could be something like this: (untested)
> 
> --8<---------------cut here---------------start------------->8---
>        #:phases
>        (modify-phases %standard-phases
>          (delete 'configure)
>          (add-after 'unpack 'inhibit-terminfo-install
>                     (lambda _
>                       (substitute* "Makefile"
>                         (("\t@tic -s st.info") ""))
>                       #t)))))
> --8<---------------cut here---------------end--------------->8---
> 
> Also, we should probably rename dwm.scm to suckless.scm.
> GNU_SYSTEM_MODULES in gnu-system.am should be updated accordingly,
> keeping it sorted.
> 
>> diff --git a/gnu/packages/dwm.scm b/gnu/packages/dwm.scm
>> index 98fa122..8ce078b 100644
>> --- a/gnu/packages/dwm.scm
>> +++ b/gnu/packages/dwm.scm
> 
> Please add a copyright line for yourself to the top of the file.
> 
>> @@ -22,7 +22,11 @@
>>    #:use-module (guix download)
>>    #:use-module (guix build-system gnu)
>>    #:use-module (gnu packages)
>> -  #:use-module (gnu packages xorg))
>> +  #:use-module (gnu packages xorg)
>> +  #:use-module (gnu packages fonts)
>> +  #:use-module (gnu packages ncurses)
>> +  #:use-module (gnu packages pkg-config)
>> +  #:use-module ((gnu packages fontutils) #:prefix font-utils:))
> 
> Instead of adding a prefix for (gnu package fontutils), better to add a
> 'license:' prefix for (guix licenses) and update the 'license' fields 
> of
> the existing packages accordingly.
> 
>> 
>>  (define-public dwm
>>    (package
>> @@ -139,3 +143,47 @@ numbers of user-defined menu items efficiently.")
>>      (description
>>       "Simple X session lock with trivial feedback on password 
>> entry.")
>>      (license x11)))
>> +
>> +
>> +(define-public st
> 
> Just one blank line between packages please.
> 
>> +  (package
>> +    (name "st")
>> +    (version "0.5")
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append "http://dl.suckless.org/st/st-"
>> +                           version ".tar.gz"))
>> +       (patches (list (search-patch 
>> "st-0.5-do-not-install-terminfo.patch")))
>> +       (sha256
>> +        (base32
>> +         "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f"))))
>> +    (build-system gnu-build-system)
>> +    (arguments
>> +     '(#:tests? #f ; no tests
>> +       #:make-flags (list "CC=gcc"
>> +                          (string-append "PREFIX=" %output))
>> +       #:phases
>> +       (alist-delete 'configure %standard-phases)))
>> +    (inputs
>> +     `(("libx11" ,libx11)
>> +       ("libxft" ,libxft)
>> +       ("libxcomposite" ,libxcomposite)
>> +       ("compositeproto" ,compositeproto)
>> +       ("libxext" ,libxext)
>> +       ("xextproto" ,xextproto)
>> +       ("libxrender" ,libxrender)
>> +       ("fontconfig" ,font-utils:fontconfig)
>> +       ("freetype" ,font-utils:freetype)
>> +       ("font-liberation" ,font-liberation)))
>> +    (native-inputs `(("pkg-config" ,pkg-config)
>> +                     ("ncurses" ,ncurses)))
> 
> Is ncurses really needed here as a native-input?  If 'st' needs to be
> linked to it for use at run time, then it should be a normal input.  It
> should only be a native-input if it's needed at build time.  That would
> be surprising to me, since the build process within guix-daemon is
> obviously non-interactive.

No it is not needed, since it's only useful to install the terminfo 
file. I removed it.

> 
>> +    (home-page "http://st.suckless.org/")
>> +    (synopsis "Simple terminal emulator")
>> +    (description
>> +     "Xterm is bloated and unmaintainable.  It has over 65K lines of 
>> code and
>> +      emulates obscure and obsolete terminals you will never need.  
>> The popular
>> +      alternative, rxvt has only 32K lines of code.  This is just too 
>> much for
>> +      something as simple as a terminal emulator; it's yet another 
>> example of
>> +      code complexity.  st fix that.")
> 
> See above.
> 
> Can you send an updated patch?
> 
>      Thanks!
>        Mark

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-st.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-st.patch, Size: 3644 bytes --]

From 57f2762b7a501a92fbcb5b6bed62f2bbae413eea Mon Sep 17 00:00:00 2001
From: amz3 <amirouche@hypermove.net>
Date: Sun, 7 Jun 2015 19:04:28 +0200
Subject: [PATCH 1/2] gnu: Add st.

* gnu/packages/dwm.scm (st): New variable.
---
 gnu/packages/dwm.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/dwm.scm b/gnu/packages/dwm.scm
index 98fa122..fd98acc 100644
--- a/gnu/packages/dwm.scm
+++ b/gnu/packages/dwm.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,12 +18,15 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages dwm)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fonts)
+  #:use-module (gnu packages pkg-config)
+  #:use-module ((gnu packages fontutils)))
 
 (define-public dwm
   (package
@@ -83,7 +87,7 @@ left corner.
 
 dwm draws a small customizable border around windows to indicate the focus
 state.")
-    (license x11)))
+    (license license:x11)))
 
 (define-public dmenu
   (package
@@ -111,7 +115,7 @@ state.")
     (description
      "A dynamic menu for X, originally designed for dwm.  It manages large
 numbers of user-defined menu items efficiently.")
-    (license x11)))
+    (license license:x11)))
 
 (define-public slock
   (package
@@ -138,4 +142,50 @@ numbers of user-defined menu items efficiently.")
     (synopsis "Simple X session lock")
     (description
      "Simple X session lock with trivial feedback on password entry.")
-    (license x11)))
+    (license license:x11)))
+
+(define-public st
+  (package
+    (name "st")
+    (version "0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://dl.suckless.org/st/st-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; no tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-after 'unpack 'inhibit-terminfo-install
+                    (lambda _
+                      (substitute* "Makefile"
+                        (("\t@tic -s st.info") ""))
+                      #t)))))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxft" ,libxft)
+       ("libxcomposite" ,libxcomposite)
+       ("compositeproto" ,compositeproto)
+       ("libxext" ,libxext)
+       ("xextproto" ,xextproto)
+       ("libxrender" ,libxrender)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("font-liberation" ,font-liberation)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (home-page "http://st.suckless.org/")
+    (synopsis "Simple terminal emulator")
+    (description
+     "St implements a simple and lightweight terminal emulator.  It
+implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
+antialiased fonts (using fontconfig), fallback fonts, resizing, and line
+drawing.")
+    (license license:x11)))
-- 
2.2.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Rename-gnu-packages-dwm-to-gnu-packages-suckless.patch --]
[-- Type: text/x-diff; name=0002-gnu-Rename-gnu-packages-dwm-to-gnu-packages-suckless.patch, Size: 16526 bytes --]

From fe83339abe41aecbeac546a39f1325c1c42f7250 Mon Sep 17 00:00:00 2001
From: amz3 <amirouche@hypermove.net>
Date: Sat, 13 Jun 2015 21:10:45 +0200
Subject: [PATCH 2/2] gnu: Rename (gnu packages dwm) to (gnu packages
 suckless).

    * gnu/packages/dwm.scm: Rename this ...
    * gnu/packages/suckless.scm: ... to this.
    * gnu-system.am (GNU_SYSTEM_MODULES): Change dwm.scm to suckless.scm.
---
 gnu-system.am             |   2 +-
 gnu/packages/dwm.scm      | 191 ----------------------------------------------
 gnu/packages/suckless.scm | 191 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 192 insertions(+), 192 deletions(-)
 delete mode 100644 gnu/packages/dwm.scm
 create mode 100644 gnu/packages/suckless.scm

diff --git a/gnu-system.am b/gnu-system.am
index 2cd4c62..46c8f7a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -85,7 +85,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/dns.scm				\
   gnu/packages/docbook.scm			\
   gnu/packages/doxygen.scm			\
-  gnu/packages/dwm.scm				\
   gnu/packages/ebook.scm			\
   gnu/packages/ed.scm				\
   gnu/packages/elf.scm				\
@@ -279,6 +278,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/ssh.scm				\
   gnu/packages/stalonetray.scm			\
   gnu/packages/statistics.scm			\
+  gnu/packages/suckless.scm			\
   gnu/packages/swig.scm				\
   gnu/packages/sxiv.scm				\
   gnu/packages/synergy.scm			\
diff --git a/gnu/packages/dwm.scm b/gnu/packages/dwm.scm
deleted file mode 100644
index fd98acc..0000000
--- a/gnu/packages/dwm.scm
+++ /dev/null
@@ -1,191 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
-;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; 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 dwm)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages fonts)
-  #:use-module (gnu packages pkg-config)
-  #:use-module ((gnu packages fontutils)))
-
-(define-public dwm
-  (package
-    (name "dwm")
-    (version "6.0")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "http://dl.suckless.org/dwm/dwm-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32 "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f
-       #:phases
-       (alist-replace
-        'configure
-        (lambda _
-         (substitute* "Makefile" (("\\$\\{CC\\}") "gcc"))
-         #t)
-        (alist-replace
-         'install
-         (lambda* (#:key outputs #:allow-other-keys)
-          (let ((out (assoc-ref outputs "out")))
-           (zero?
-            (system* "make" "install"
-                     (string-append "DESTDIR=" out) "PREFIX="))))
-         %standard-phases))))
-    (inputs
-     `(("libx11" ,libx11)
-       ("libxinerama" ,libxinerama)))
-    (home-page "http://dwm.suckless.org/")
-    (synopsis "Dynamic window manager")
-    (description
-     "dwm is a dynamic window manager for X.  It manages windows in tiled,
-monocle and floating layouts.  All of the layouts can be applied dynamically,
-optimising the environment for the application in use and the task performed.
-
-In tiled layout windows are managed in a master and stacking area.  The master
-area contains the window which currently needs most attention, whereas the
-stacking area contains all other windows.  In monocle layout all windows are
-maximised to the screen size.  In floating layout windows can be resized and
-moved freely.  Dialog windows are always managed floating, regardless of the
-layout applied.
-
-Windows are grouped by tags.  Each window can be tagged with one or multiple
-tags.  Selecting certain tags displays all windows with these tags.
-
-Each screen contains a small status bar which displays all available tags, the
-layout, the number of visible windows, the title of the focused window, and the
-text read from the root window name property, if the screen is focused.  A
-floating window is indicated with an empty square and a maximised floating
-window is indicated with a filled square before the windows title.  The selected
-tags are indicated with a different color.  The tags of the focused window are
-indicated with a filled square in the top left corner.  The tags which are
-applied to one or more windows are indicated with an empty square in the top
-left corner.
-
-dwm draws a small customizable border around windows to indicate the focus
-state.")
-    (license license:x11)))
-
-(define-public dmenu
-  (package
-    (name "dmenu")
-    (version "4.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://dl.suckless.org/tools/dmenu-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:tests? #f ; no tests
-       #:make-flags (list "CC=gcc"
-                          (string-append "PREFIX=" %output))
-       #:phases
-       (alist-delete 'configure %standard-phases)))
-    (inputs
-     `(("libx11" ,libx11)
-       ("libxinerama" ,libxinerama)))
-    (home-page "http://tools.suckless.org/dmenu/")
-    (synopsis "Dynamic menu")
-    (description
-     "A dynamic menu for X, originally designed for dwm.  It manages large
-numbers of user-defined menu items efficiently.")
-    (license license:x11)))
-
-(define-public slock
-  (package
-    (name "slock")
-    (version "1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://dl.suckless.org/tools/slock-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:tests? #f ; no tests
-       #:make-flags (list "CC=gcc"
-                          (string-append "PREFIX=" %output))
-       #:phases (alist-delete 'configure %standard-phases)))
-    (inputs
-     `(("libx11" ,libx11)
-       ("libxext" ,libxext)
-       ("libxinerama" ,libxinerama)))
-    (home-page "http://tools.suckless.org/slock/")
-    (synopsis "Simple X session lock")
-    (description
-     "Simple X session lock with trivial feedback on password entry.")
-    (license license:x11)))
-
-(define-public st
-  (package
-    (name "st")
-    (version "0.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://dl.suckless.org/st/st-"
-                           version ".tar.gz"))
-       (sha256
-        (base32
-         "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:tests? #f ; no tests
-       #:make-flags (list "CC=gcc"
-                          (string-append "PREFIX=" %output))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-after 'unpack 'inhibit-terminfo-install
-                    (lambda _
-                      (substitute* "Makefile"
-                        (("\t@tic -s st.info") ""))
-                      #t)))))
-    (inputs
-     `(("libx11" ,libx11)
-       ("libxft" ,libxft)
-       ("libxcomposite" ,libxcomposite)
-       ("compositeproto" ,compositeproto)
-       ("libxext" ,libxext)
-       ("xextproto" ,xextproto)
-       ("libxrender" ,libxrender)
-       ("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("font-liberation" ,font-liberation)))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (home-page "http://st.suckless.org/")
-    (synopsis "Simple terminal emulator")
-    (description
-     "St implements a simple and lightweight terminal emulator.  It
-implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
-antialiased fonts (using fontconfig), fallback fonts, resizing, and line
-drawing.")
-    (license license:x11)))
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
new file mode 100644
index 0000000..432cbae
--- /dev/null
+++ b/gnu/packages/suckless.scm
@@ -0,0 +1,191 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2015 Amirouche Boubekki <amirouche@hypermove.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; 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 suckless)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fonts)
+  #:use-module (gnu packages pkg-config)
+  #:use-module ((gnu packages fontutils)))
+
+(define-public dwm
+  (package
+    (name "dwm")
+    (version "6.0")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://dl.suckless.org/dwm/dwm-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32 "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (alist-replace
+        'configure
+        (lambda _
+         (substitute* "Makefile" (("\\$\\{CC\\}") "gcc"))
+         #t)
+        (alist-replace
+         'install
+         (lambda* (#:key outputs #:allow-other-keys)
+          (let ((out (assoc-ref outputs "out")))
+           (zero?
+            (system* "make" "install"
+                     (string-append "DESTDIR=" out) "PREFIX="))))
+         %standard-phases))))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxinerama" ,libxinerama)))
+    (home-page "http://dwm.suckless.org/")
+    (synopsis "Dynamic window manager")
+    (description
+     "dwm is a dynamic window manager for X.  It manages windows in tiled,
+monocle and floating layouts.  All of the layouts can be applied dynamically,
+optimising the environment for the application in use and the task performed.
+
+In tiled layout windows are managed in a master and stacking area.  The master
+area contains the window which currently needs most attention, whereas the
+stacking area contains all other windows.  In monocle layout all windows are
+maximised to the screen size.  In floating layout windows can be resized and
+moved freely.  Dialog windows are always managed floating, regardless of the
+layout applied.
+
+Windows are grouped by tags.  Each window can be tagged with one or multiple
+tags.  Selecting certain tags displays all windows with these tags.
+
+Each screen contains a small status bar which displays all available tags, the
+layout, the number of visible windows, the title of the focused window, and the
+text read from the root window name property, if the screen is focused.  A
+floating window is indicated with an empty square and a maximised floating
+window is indicated with a filled square before the windows title.  The selected
+tags are indicated with a different color.  The tags of the focused window are
+indicated with a filled square in the top left corner.  The tags which are
+applied to one or more windows are indicated with an empty square in the top
+left corner.
+
+dwm draws a small customizable border around windows to indicate the focus
+state.")
+    (license license:x11)))
+
+(define-public dmenu
+  (package
+    (name "dmenu")
+    (version "4.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://dl.suckless.org/tools/dmenu-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; no tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:phases
+       (alist-delete 'configure %standard-phases)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxinerama" ,libxinerama)))
+    (home-page "http://tools.suckless.org/dmenu/")
+    (synopsis "Dynamic menu")
+    (description
+     "A dynamic menu for X, originally designed for dwm.  It manages large
+numbers of user-defined menu items efficiently.")
+    (license license:x11)))
+
+(define-public slock
+  (package
+    (name "slock")
+    (version "1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://dl.suckless.org/tools/slock-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; no tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:phases (alist-delete 'configure %standard-phases)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxinerama" ,libxinerama)))
+    (home-page "http://tools.suckless.org/slock/")
+    (synopsis "Simple X session lock")
+    (description
+     "Simple X session lock with trivial feedback on password entry.")
+    (license license:x11)))
+
+(define-public st
+  (package
+    (name "st")
+    (version "0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://dl.suckless.org/st/st-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; no tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-after 'unpack 'inhibit-terminfo-install
+                    (lambda _
+                      (substitute* "Makefile"
+                        (("\t@tic -s st.info") ""))
+                      #t)))))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxft" ,libxft)
+       ("libxcomposite" ,libxcomposite)
+       ("compositeproto" ,compositeproto)
+       ("libxext" ,libxext)
+       ("xextproto" ,xextproto)
+       ("libxrender" ,libxrender)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("font-liberation" ,font-liberation)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (home-page "http://st.suckless.org/")
+    (synopsis "Simple terminal emulator")
+    (description
+     "St implements a simple and lightweight terminal emulator.  It
+implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
+antialiased fonts (using fontconfig), fallback fonts, resizing, and line
+drawing.")
+    (license license:x11)))
-- 
2.2.1

Re: [PATCH] Add st

[Cyril Roelandt]

On 06/13/2015 09:13 PM, amirouche@hypermove.net wrote:
> I attached two patches. The second patch is to rename dwm.scm
> 

Not sure whether we want to have suckless.scm. Does it make sense to the
other devs?

If we end up using "suckless.scm", I'd rather rename it first, and then
add st to it.


Cyril.

Re: [PATCH] Add st

[Ludovic Courtès]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> Not sure whether we want to have suckless.scm. Does it make sense to the
> other devs?

I think people on IRC were OK with the idea.

> If we end up using "suckless.scm", I'd rather rename it first, and then
> add st to it.

Yes, but no big deal.

Ludo’.

Re: [PATCH] Add st

[Mark H Weaver]

amirouche@hypermove.net writes:
> I attached two patches. The second patch is to rename dwm.scm

I pushed these with two minor modifications:

* I removed one layer of parentheses from:
  #:use-module ((gnu packages fontutils))

* I removed the indentation in the commit log of the second patch,
  to conform to our conventions.

     Thanks!
       Mark