[PATCH] Add bspwm.

[PATCH] Add bspwm.

[rws]

FYI, this is actually my first patch to Guix. (I just installed Guix two days
ago too.) Hopefully this turns out okay, but in any case let me know how I went.

Also, if you see the IRC (#guix) right now (at time of writing), you can see
some discussion between me and rekado about setting "CC=gcc" for the make-flags,
and whether or not it's needed. Can you confirm if I did it correct?

rws (1):
  gnu: bpswm, sxhkd: New packages.

 gnu/packages/wm.scm      | 33 +++++++++++++++++++++++++++++++++
 gnu/packages/xdisorg.scm | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

-- 
2.5.2

[PATCH] gnu: bpswm, sxhkd: New packages.

[rws]

* gnu/packages/wm.scm (bspwm): New package.
* gnu/packages/xdisorg.scm (sxhkd): New package.
---
 gnu/packages/wm.scm      | 33 +++++++++++++++++++++++++++++++++
 gnu/packages/xdisorg.scm | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 9ca5b96..0e32126 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -64,6 +64,39 @@ single/double-quoted strings, environment variable expansion, functions and
 nested include statements).")
     (license isc)))
 
+(define-public bspwm
+  (package
+    (name "bspwm")
+    (version "0.9")
+    (source
+     (origin
+       (file-name (string-append name "-" version ".tar.gz"))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/baskerville/bspwm/archive/"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1pig0h2jk8wipyz90j69c4bk37bfyq60asnn0v0bqld2p2vjvyqy"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libxcb" ,libxcb)
+       ("libxinerama" ,libxinerama)
+       ("sxhkd" ,sxhkd)
+       ("xcb-util" ,xcb-util)
+       ("xcb-util-keysyms" ,xcb-util-keysyms)
+       ("xcb-util-wm" ,xcb-util-wm)))
+    (arguments
+     '(#:phases (alist-delete 'configure %standard-phases)
+       #:tests? #f ;; No tests.
+       #:make-flags (list "CC=gcc" (string-append
+                                    "PREFIX=" (assoc-ref %outputs "out")))))
+    (home-page "https://github.com/baskerville/bspwm")
+    (synopsis "Tiling window manager based on binary space partitioning")
+    (description "bspwm is a tiling window manager that represents windows as
+the leaves of a full binary tree.")
+    (license bsd-2)))
+
 (define-public i3status
   (package
     (name "i3status")
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 96e7c3a..c080544 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -32,6 +32,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
+  #:use-module (gnu packages asciidoc)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
@@ -492,6 +493,38 @@ clicks or timed double clicks take actions.  Also all functions that work in
 Guile will work for XBindKeys.")
     (license license:gpl2+)))
 
+(define-public sxhkd
+  (package
+    (name "sxhkd")
+    (version "0.5.5")
+    (source
+     (origin
+       (file-name (string-append name "-" version ".tar.gz"))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/baskerville/sxhkd/archive/"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "04s3y2bq9502gw72jj3y2zsh96yj3qg2av3zsa8ahd2farvrysg6"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("asciidoc" ,asciidoc)
+       ("libxcb" ,libxcb)
+       ("xcb-util" ,xcb-util)
+       ("xcb-util-keysyms" ,xcb-util-keysyms)
+       ("xcb-util-wm" ,xcb-util-wm)))
+    (arguments
+     '(#:phases (alist-delete 'configure %standard-phases)
+       #:tests? #f ;; No tests.
+       #:make-flags (list "CC=gcc" (string-append
+                                    "PREFIX=" (assoc-ref %outputs "out")))))
+    (home-page "https://github.com/baskerville/sxhkd")
+    (synopsis "Simple X hotkey daemon")
+    (description "sxhkd is a simple X hotkey daemon with a powerful and
+compact configuration syntax.")
+    (license bsd-2)))
+
 (define-public rxvt-unicode
   (package
     (name "rxvt-unicode")
-- 
2.5.2

Re: [PATCH] gnu: bpswm, sxhkd: New packages.

[Alex Kost]

Hello and thanks for contributing!

We prefer a separate patch per package, so please split this in two.
Also was it intended to use "rws" as the Author name?  If not, then
please configure your git to use a name you want.

rws (2015-10-09 16:51 +0300) wrote:

> * gnu/packages/wm.scm (bspwm): New package.
> * gnu/packages/xdisorg.scm (sxhkd): New package.

Our convention is to write "New variable" because the package recipes
are just Guile variables.

Also don't forget to add copyright lines for yourself to the beggining
of wm.scm and xdisorg.scm:

;;; Copyright © 2015 ...

[...]
> +    (synopsis "Simple X hotkey daemon")
> +    (description "sxhkd is a simple X hotkey daemon with a powerful and
> +compact configuration syntax.")
> +    (license bsd-2)))

Unlike the previous package, here it should be (license license:bsd-2).
As you can see in (gnu packages xdisorg), (guix licenses) module is used
with "#:prefix license:".

The rest looks good to me.  Could you send the updated patches?  Thanks!

-- 
Alex

[PATCH 0/2] Add sxhkd and bspwm.

[xd1le]

> Also was it intended to use "rws" as the Author name?  If not, then
> please configure your git to use a name you want.

Well yes, I don't want to use my real name. I changed it my irc nick, is that
okay?

> Unlike the previous package, here it should be (license license:bsd-2).
> As you can see in (gnu packages xdisorg), (guix licenses) module is used
> with "#:prefix license:".

So what's the purpose of the prefix? (Just to learn.)

> Though I have no idea why it defaults to "cc" since Makefile has "CC ?= gcc".

Yes same... that's what rekado said as well..

xd1le (2):
  gnu: sxhkd: New variable.
  gnu: bspwm: New variable.

 gnu/packages/wm.scm      | 34 ++++++++++++++++++++++++++++++++++
 gnu/packages/xdisorg.scm | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

-- 
2.5.2

[PATCH 1/2] gnu: sxhkd: New variable.

[xd1le]

* gnu/packages/xdisorg.scm (sxhkd): New variable.
---
 gnu/packages/xdisorg.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 96e7c3a..40dbef6 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
 ;;; Copyright © 2015 Alexander I.Grafov <grafov@gmail.com>
 ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
+;;; Copyright © 2015 xd1le <elisp.vim@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,6 +33,7 @@
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
+  #:use-module (gnu packages asciidoc)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
@@ -492,6 +494,38 @@ clicks or timed double clicks take actions.  Also all functions that work in
 Guile will work for XBindKeys.")
     (license license:gpl2+)))
 
+(define-public sxhkd
+  (package
+    (name "sxhkd")
+    (version "0.5.5")
+    (source
+     (origin
+       (file-name (string-append name "-" version ".tar.gz"))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/baskerville/sxhkd/archive/"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "04s3y2bq9502gw72jj3y2zsh96yj3qg2av3zsa8ahd2farvrysg6"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("asciidoc" ,asciidoc)
+       ("libxcb" ,libxcb)
+       ("xcb-util" ,xcb-util)
+       ("xcb-util-keysyms" ,xcb-util-keysyms)
+       ("xcb-util-wm" ,xcb-util-wm)))
+    (arguments
+     '(#:phases (alist-delete 'configure %standard-phases)
+       #:tests? #f ;; No tests.
+       #:make-flags (list "CC=gcc" (string-append
+                                    "PREFIX=" (assoc-ref %outputs "out")))))
+    (home-page "https://github.com/baskerville/sxhkd")
+    (synopsis "Simple X hotkey daemon")
+    (description "sxhkd is a simple X hotkey daemon with a powerful and
+compact configuration syntax.")
+    (license license:bsd-2)))
+
 (define-public rxvt-unicode
   (package
     (name "rxvt-unicode")
-- 
2.5.2

[PATCH 2/2] gnu: bspwm: New variable.

[xd1le]

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

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 9ca5b96..fe7d540 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015 xd1le <elisp.vim@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,6 +65,39 @@ single/double-quoted strings, environment variable expansion, functions and
 nested include statements).")
     (license isc)))
 
+(define-public bspwm
+  (package
+    (name "bspwm")
+    (version "0.9")
+    (source
+     (origin
+       (file-name (string-append name "-" version ".tar.gz"))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/baskerville/bspwm/archive/"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1pig0h2jk8wipyz90j69c4bk37bfyq60asnn0v0bqld2p2vjvyqy"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libxcb" ,libxcb)
+       ("libxinerama" ,libxinerama)
+       ("sxhkd" ,sxhkd)
+       ("xcb-util" ,xcb-util)
+       ("xcb-util-keysyms" ,xcb-util-keysyms)
+       ("xcb-util-wm" ,xcb-util-wm)))
+    (arguments
+     '(#:phases (alist-delete 'configure %standard-phases)
+       #:tests? #f ;; No tests.
+       #:make-flags (list "CC=gcc" (string-append
+                                    "PREFIX=" (assoc-ref %outputs "out")))))
+    (home-page "https://github.com/baskerville/bspwm")
+    (synopsis "Tiling window manager based on binary space partitioning")
+    (description "bspwm is a tiling window manager that represents windows as
+the leaves of a full binary tree.")
+    (license bsd-2)))
+
 (define-public i3status
   (package
     (name "i3status")
-- 
2.5.2

Re: [PATCH 0/2] Add sxhkd and bspwm.

[Alex Kost]

xd1le (2015-10-10 14:06 +0300) wrote:

>> Also was it intended to use "rws" as the Author name?  If not, then
>> please configure your git to use a name you want.
>
> Well yes, I don't want to use my real name. I changed it my irc nick, is that
> okay?

Okay for me, but I don't know what the others think, as you will be the
first, who would like to use just a nickname.

>> Unlike the previous package, here it should be (license license:bsd-2).
>> As you can see in (gnu packages xdisorg), (guix licenses) module is used
>> with "#:prefix license:".
>
> So what's the purpose of the prefix? (Just to learn.)

To avoid conflicts.  For example, both (gnu packages compression) and
(guix licenses) modules export 'zlib' variables, so we need to
distinguish them somehow.  That's why there is a prefix: just 'zlib'
means a package and 'license:zlib' means a license.

[...]
>   gnu: sxhkd: New variable.
>   gnu: bspwm: New variable.

Sorry, I didn't mean that the first lines should also be changed.  So a
full commit message would be:

--8<---------------cut here---------------start------------->8---
gnu: Add sxhkd.

* gnu/packages/xdisorg.scm (sxhkd): New variable.
--8<---------------cut here---------------end--------------->8---

No need to resend the patches, I will fix it and push soon if there will
be no other comments.

-- 
Alex

Re: [PATCH 0/2] Add sxhkd and bspwm.

[Efraim Flashner]

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

On Sun, 11 Oct 2015 11:19:02 +0300
Alex Kost <alezost@gmail.com> wrote:

> xd1le (2015-10-10 14:06 +0300) wrote:
> 
> >> Also was it intended to use "rws" as the Author name?  If not, then
> >> please configure your git to use a name you want.
> >
> > Well yes, I don't want to use my real name. I changed it my irc nick, is
> > that okay?
> 
> Okay for me, but I don't know what the others think, as you will be the
> first, who would like to use just a nickname.
> 

We're not signing commits so the name doesn't need to match a GPG key, and it
makes sense to me that each person should have one "commit name" so their
contributions can be kept track of (like we have with the .mailmap file), and
it would be nice to have a working email address that won't expire too soon.
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 0/2] Add sxhkd and bspwm.

[Alex Kost]

xd1le (2015-10-10 14:06 +0300) wrote:

> xd1le (2):
>   gnu: sxhkd: New variable.
>   gnu: bspwm: New variable.
>
>  gnu/packages/wm.scm      | 34 ++++++++++++++++++++++++++++++++++
>  gnu/packages/xdisorg.scm | 34 ++++++++++++++++++++++++++++++++++
>  2 files changed, 68 insertions(+)

Since there were no other comments, I have pushed these patches (with
slight modifications).  Thank you!

-- 
Alex

Re: [PATCH 0/2] Add sxhkd and bspwm.

[RW. S]

Awesome! Thanks! :)

On Sat, Oct 17, 2015 at 3:57 AM, Alex Kost <alezost@gmail.com> wrote:
> xd1le (2015-10-10 14:06 +0300) wrote:
>
>> xd1le (2):
>>   gnu: sxhkd: New variable.
>>   gnu: bspwm: New variable.
>>
>>  gnu/packages/wm.scm      | 34 ++++++++++++++++++++++++++++++++++
>>  gnu/packages/xdisorg.scm | 34 ++++++++++++++++++++++++++++++++++
>>  2 files changed, 68 insertions(+)
>
> Since there were no other comments, I have pushed these patches (with
> slight modifications).  Thank you!
>
> --
> Alex



-- 
https://keybase.io/rws

Re: [PATCH] Add bspwm.

[Alex Kost]

rws (2015-10-09 16:51 +0300) wrote:

> FYI, this is actually my first patch to Guix. (I just installed Guix two days
> ago too.) Hopefully this turns out okay, but in any case let me know how I went.

This is a really good first patch!

> Also, if you see the IRC (#guix) right now (at time of writing), you can see
> some discussion between me and rekado about setting "CC=gcc" for the make-flags,
> and whether or not it's needed. Can you confirm if I did it correct?

Yes, I think so.  If it is not specified, the build fails with:

  make: cc: Command not found

Though I have no idea why it defaults to "cc" since Makefile has "CC ?= gcc".

-- 
Alex