[PATCH 0/7] Add quassel irc

[PATCH 0/7] Add quassel irc

[Efraim Flashner]

Here's a couple of patches to add the quassel irc client. Quassel has 3
parts, a server side, a client side, and a "monolithic" option that builds
both halves in one binary. It's not really worth it to try to split them
into separate outputs, so they're all just there, with a note about how
much space the binary takes up. I know we just got rid of kde.scm, but
this adds it back. Oxygen-icons are available for download from KDE in
their kde-frameworks section, and qca and snorenotify aren't so they seemed
like they fit better in kde.scm. While I was at it, I moved irssi and
weechat into a newly created irc.scm since that seemed to be the best
option here.

Efraim Flashner (7):
  gnu: Add oxygen-icons.
  gnu: Add qca.
  gnu: Add snorenotify.
  gnu: Add quassel.
  gnu: irssi: Move to irc.scm.
  gnu: irssi: Use 'modify-phases'.
  gnu: weechat: Move to irc.scm.

 gnu-system.am                   |   4 +-
 gnu/packages/irc.scm            | 190 ++++++++++++++++++++++++++++++++++++++++
 gnu/packages/irssi.scm          |  70 ---------------
 gnu/packages/kde-frameworks.scm |  24 +++++
 gnu/packages/kde.scm            |  79 +++++++++++++++++
 gnu/packages/weechat.scm        | 106 ----------------------
 6 files changed, 295 insertions(+), 178 deletions(-)
 create mode 100644 gnu/packages/irc.scm
 delete mode 100644 gnu/packages/irssi.scm
 create mode 100644 gnu/packages/kde.scm
 delete mode 100644 gnu/packages/weechat.scm

-- 
2.7.0

[PATCH 1/7] gnu: Add oxygen-icons.

[Efraim Flashner]

* gnu/packages/kde-frameworks.scm (oxygen-icons): New variable.
---
 gnu/packages/kde-frameworks.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index ec637e5..079d6d0 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -91,3 +91,27 @@ lower level classes for interaction with the X Windowing System.")
     ;; Some source files mention lgpl2.0+, but the included license is
     ;; the lgpl2.1. Some source files are under non-copyleft licenses.
     (license license:lgpl2.1+)))
+
+(define-public oxygen-icons
+  (package
+    (name "oxygen-icons")
+    (version kde-frameworks-version)
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "http://download.kde.org/stable/frameworks/"
+                            (version-major+minor version) "/"
+                            name "5-"version ".tar.xz"))
+        (sha256
+         (base32
+          "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("qt" ,qt)))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Oxygen icon theme for the KDE desktop")
+    (description "Oxygen icon theme for the KDE desktop")
+    (license license:lgpl3+)))
-- 
2.7.0

[PATCH 2/7] gnu: Add qca.

[Efraim Flashner]

* gnu/packages/kde.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Register it.
---
 gnu-system.am        |  1 +
 gnu/packages/kde.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 gnu/packages/kde.scm

diff --git a/gnu-system.am b/gnu-system.am
index 502993b..a8efa8d 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -172,6 +172,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/jemalloc.scm			\
   gnu/packages/jrnl.scm				\
   gnu/packages/julia.scm			\
+  gnu/packages/kde.scm              \
   gnu/packages/kde-frameworks.scm		\
   gnu/packages/key-mon.scm			\
   gnu/packages/kodi.scm				\
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
new file mode 100644
index 0000000..64771fc
--- /dev/null
+++ b/gnu/packages/kde.scm
@@ -0,0 +1,53 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;;
+;;; 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 kde)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages qt))
+
+(define-public qca
+  (package
+    (name "qca")
+    (version "2.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "http://download.kde.org/stable/qca/" version
+                            "/src/qca-" version ".tar.xz"))
+        (sha256
+         (base32
+          "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("openssl" ,openssl)
+       ("qt" ,qt)))
+    (home-page "http://delta.affinix.com/qca/")
+    (synopsis "Libraries for the Qt Cryptographic Architecture")
+    (description "The Qt Cryptographic Architecture (QCA) provides a
+straightforward and cross-platform API for a range of cryptographic features,
+including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart
+cards.")
+    (license license:lgpl2.1)))
-- 
2.7.0

Re: [PATCH 2/7] gnu: Add qca.

[Andreas Enge]

On Sun, Feb 28, 2016 at 12:10:07PM +0200, Efraim Flashner wrote:
> +(define-public qca

Looks good. It could also go into the qt module, but I suppose we need
a space for kde applications anyway.

Andreas

[PATCH 3/7] gnu: Add snorenotify.

[Efraim Flashner]

* gnu/packages/kde.scm (snorenotify): New variable.
---
 gnu/packages/kde.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 64771fc..3c5632f 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -22,6 +22,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages qt))
@@ -51,3 +52,28 @@ straightforward and cross-platform API for a range of cryptographic features,
 including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart
 cards.")
     (license license:lgpl2.1)))
+
+(define-public snorenotify
+  (package
+    (name "snorenotify")
+    (version "0.7.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "http://download.kde.org/stable/snorenotify/"
+                            version "/src/snorenotify-" version ".tar.xz"))
+        (sha256
+         (base32
+          "0jz6ivk90h7iwgyxar7xzzj8yvzn6s1my6cqs9bdnwqswfk1nhbd"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f)) ; both tests fail, require display
+    (inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("qt" ,qt)))
+    (home-page "https://techbase.kde.org/Projects/Snorenotify")
+    (synopsis "Qt notification framework")
+    (description "Snorenotify is a multi platform Qt notification framework.
+Using a plugin system it is possible to create notifications with many
+different notification systems")
+    (license license:lgpl3)))
-- 
2.7.0

Re: [PATCH 3/7] gnu: Add snorenotify.

[Andreas Enge]

On Sun, Feb 28, 2016 at 12:10:08PM +0200, Efraim Flashner wrote:
> +Using a plugin system it is possible to create notifications with many
> +different notification systems")

Missing "." at the end.

...

[PATCH 4/7] gnu: Add quassel.

[Efraim Flashner]

* gnu/packages/irc.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Register it.
---
 gnu-system.am        |  1 +
 gnu/packages/irc.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 gnu/packages/irc.scm

diff --git a/gnu-system.am b/gnu-system.am
index a8efa8d..8eaf8b7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -166,6 +166,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/indent.scm			\
   gnu/packages/inklingreader.scm		\
   gnu/packages/inkscape.scm			\
+  gnu/packages/irc.scm  			\
   gnu/packages/irssi.scm			\
   gnu/packages/iso-codes.scm			\
   gnu/packages/java.scm				\
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
new file mode 100644
index 0000000..6e5461a
--- /dev/null
+++ b/gnu/packages/irc.scm
@@ -0,0 +1,68 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;;
+;;; 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 irc)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module (guix build-system cmake)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages kde)
+  #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages qt))
+
+(define-public quassel
+  (package
+    (name "quassel")
+    (version "0.12.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "http://quassel-irc.org/pub/quassel-"
+                            version ".tar.bz2"))
+        (sha256
+         (base32
+          "0d6lwf6qblj1ia5j9mjy112zrmpbbg9mmxgscbgxiqychldyjgjd"))))
+    (build-system cmake-build-system)
+    (arguments
+      ;; The three binaries are not mutually exlusive, and are all built
+      ;; by default.
+     `(#:configure-flags '(;;"-DWANT_QTCLIENT=OFF" ; 5.0 MiB
+                           ;;"-DWANT_CORE=OFF" ; 2.3 MiB
+                           ;;"-DWANT_MONO=OFF" ; 6.3 MiB
+                           "-DUSE_QT5=ON" ; default is qt4
+                           "-DWITH_KDE=OFF" ; no to integration
+                           "-DWITH_OXYGEN=ON" ; on=embed icons
+                           "-DWITH_WEBKIT=ON") ; wants qtwebkit, in qt5
+       #:tests? #f)) ; no test target
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("oxygen-icons" ,oxygen-icons)
+       ("qca" ,qca)
+       ("qt", qt)
+       ("snorenotify" ,snorenotify)
+       ("zlib" ,zlib)))
+    (home-page "http://quassel-irc.org/")
+    (synopsis "distributed IRC client")
+    (description "Quassel is a modern, cross-platform, distributed IRC client,
+meaning that one or more clients can attach to and detach from the central core.
+It's much like the popular combination of screen and a text-based IRC client
+such as WeeChat or irssi, but graphical.")
+    (license (list license:gpl2 license:gpl3)))) ;; dual licensed
-- 
2.7.0

Re: [PATCH 4/7] gnu: Add quassel.

[Andreas Enge]

...

On Sun, Feb 28, 2016 at 12:10:09PM +0200, Efraim Flashner wrote:
> +    (synopsis "distributed IRC client")

Start with a capital letter (this should be found by "guix lint").

> +    (description "Quassel is a modern, cross-platform, distributed IRC client,
> +meaning that one or more clients can attach to and detach from the central core.

I would drop the marketing term "modern".

> +It's much like the popular combination of screen and a text-based IRC client
> +such as WeeChat or irssi, but graphical.")

"It's" -> "It is"; better: "It resembles"?

I assume that everything builds for you and did not check the licenses...

...

Re: [PATCH 4/7] gnu: Add quassel.

[Ricardo Wurmus]

Andreas Enge <andreas@enge.fr> writes:

> ...
>
> On Sun, Feb 28, 2016 at 12:10:09PM +0200, Efraim Flashner wrote:
>> +    (synopsis "distributed IRC client")
>
> Start with a capital letter (this should be found by "guix lint").
>
>> +    (description "Quassel is a modern, cross-platform, distributed IRC client,
>> +meaning that one or more clients can attach to and detach from the central core.
>
> I would drop the marketing term "modern".

What about “cross-platform”?  I don’t think we usually keep terms like
that because what’s available in Guix is available for systems where
Guix runs.

~~ Ricardo

Re: [PATCH 4/7] gnu: Add quassel.

[Efraim Flashner]

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

On Sun, 28 Feb 2016 16:50:12 +0100
Ricardo Wurmus <rekado@elephly.net> wrote:

> Andreas Enge <andreas@enge.fr> writes:
> 
>  [...]  
>  [...]  
>  [...]  
>  [...]  
> >
> > I would drop the marketing term "modern".  
> 
> What about “cross-platform”?  I don’t think we usually keep terms like
> that because what’s available in Guix is available for systems where
> Guix runs.
> 
> ~~ Ricardo
> 

It is also available for Mac and Windows, which is I assume what they mean,
but there's also an android client. Keeping cross-platform doesn't mesh with
the other times we've stripped it out though, so I'll drop it.

-- 
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 --]

[PATCH 5/7] gnu: irssi: Move to irc.scm.

[Efraim Flashner]

* gnu/packages/irssi.scm (irssi): Move from here ...
* gnu/packages/irc.scm (irssi): ... to here.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove irssi.scm.
---
 gnu-system.am          |  1 -
 gnu/packages/irc.scm   | 50 ++++++++++++++++++++++++++++++++++--
 gnu/packages/irssi.scm | 70 --------------------------------------------------
 3 files changed, 48 insertions(+), 73 deletions(-)
 delete mode 100644 gnu/packages/irssi.scm

diff --git a/gnu-system.am b/gnu-system.am
index 8eaf8b7..ee732c0 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -167,7 +167,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/inklingreader.scm		\
   gnu/packages/inkscape.scm			\
   gnu/packages/irc.scm  			\
-  gnu/packages/irssi.scm			\
   gnu/packages/iso-codes.scm			\
   gnu/packages/java.scm				\
   gnu/packages/jemalloc.scm			\
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 6e5461a..cd2e795 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,11 +22,16 @@
   #:use-module (guix download)
   #:use-module (guix packages)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages qt))
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages tls))
 
 (define-public quassel
   (package
@@ -66,3 +72,43 @@ meaning that one or more clients can attach to and detach from the central core.
 It's much like the popular combination of screen and a text-based IRC client
 such as WeeChat or irssi, but graphical.")
     (license (list license:gpl2 license:gpl3)))) ;; dual licensed
+
+(define-public irssi
+  (package
+    (name "irssi")
+    (version "0.8.17")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://github.com/irssi-import/irssi/"
+                                 "releases/download/0.8.17/irssi-"
+                                 version ".tar.bz2"))
+             (sha256
+              (base32
+               "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (alist-replace
+        'configure
+        (lambda* (#:key inputs outputs #:allow-other-keys)
+          (let ((out (assoc-ref outputs "out"))
+                (ncurses (assoc-ref inputs "ncurses")))
+            (setenv "CONFIG_SHELL" (which "bash"))
+            (zero?
+             (system* "./configure"
+                      (string-append "--prefix=" out)
+                      (string-append "--with-ncurses=" ncurses)))))
+        %standard-phases)))
+    (inputs
+     `(("glib" ,glib)
+       ("ncurses" ,ncurses)
+       ("openssl" ,openssl)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("perl" ,perl)))
+    (home-page "http://www.irssi.org/")
+    (synopsis "Terminal-based IRC client")
+    (description
+     "Irssi is a terminal based IRC client for UNIX systems.  It also supports
+SILC and ICB protocols via plugins.")
+    (license license:gpl2+)))
diff --git a/gnu/packages/irssi.scm b/gnu/packages/irssi.scm
deleted file mode 100644
index e5c7218..0000000
--- a/gnu/packages/irssi.scm
+++ /dev/null
@@ -1,70 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
-;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
-;;;
-;;; 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 irssi)
-  #: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 glib)
-  #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages tls))
-
-(define-public irssi
-  (package
-    (name "irssi")
-    (version "0.8.17")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "https://github.com/irssi-import/irssi/"
-                                 "releases/download/0.8.17/irssi-"
-                                 version ".tar.bz2"))
-             (sha256
-              (base32
-               "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (alist-replace
-        'configure
-        (lambda* (#:key inputs outputs #:allow-other-keys)
-          (let ((out (assoc-ref outputs "out"))
-                (ncurses (assoc-ref inputs "ncurses")))
-            (setenv "CONFIG_SHELL" (which "bash"))
-            (zero?
-             (system* "./configure"
-                      (string-append "--prefix=" out)
-                      (string-append "--with-ncurses=" ncurses)))))
-        %standard-phases)))
-    (inputs
-     `(("glib" ,glib)
-       ("ncurses" ,ncurses)
-       ("openssl" ,openssl)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("perl" ,perl)))
-    (home-page "http://www.irssi.org/")
-    (synopsis "Terminal-based IRC client")
-    (description
-     "Irssi is a terminal based IRC client for UNIX systems.  It also supports
-SILC and ICB protocols via plugins.")
-    (license license:gpl2+)))
-- 
2.7.0

Re: [PATCH 5/7] gnu: irssi: Move to irc.scm.

[Andreas Enge]

...

On Sun, Feb 28, 2016 at 12:10:10PM +0200, Efraim Flashner wrote:
> * gnu/packages/irssi.scm (irssi): Move from here ...
> * gnu/packages/irc.scm (irssi): ... to here.
> * gnu-system.am (GNU_SYSTEM_MODULES): Remove irssi.scm.

Also mention the deleted file in the commit message.

...

[PATCH 6/7] gnu: irssi: Use 'modify-phases'.

[Efraim Flashner]

* gnu/packages/irc.scm (irssi)[arguments]: Use 'modify-phases'.
---
 gnu/packages/irc.scm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index cd2e795..b9ac572 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -88,17 +88,16 @@ such as WeeChat or irssi, but graphical.")
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-       (alist-replace
-        'configure
-        (lambda* (#:key inputs outputs #:allow-other-keys)
-          (let ((out (assoc-ref outputs "out"))
-                (ncurses (assoc-ref inputs "ncurses")))
-            (setenv "CONFIG_SHELL" (which "bash"))
-            (zero?
-             (system* "./configure"
-                      (string-append "--prefix=" out)
-                      (string-append "--with-ncurses=" ncurses)))))
-        %standard-phases)))
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (ncurses (assoc-ref inputs "ncurses")))
+               (setenv "CONFIG_SHELL" (which "bash"))
+               (zero?
+                (system* "./configure"
+                         (string-append "--prefix=" out)
+                         (string-append "--with-ncurses=" ncurses)))))))))
     (inputs
      `(("glib" ,glib)
        ("ncurses" ,ncurses)
-- 
2.7.0

Re: [PATCH 6/7] gnu: irssi: Use 'modify-phases'.

[Andreas Enge]

...

On Sun, Feb 28, 2016 at 12:10:11PM +0200, Efraim Flashner wrote:
> * gnu/packages/irc.scm (irssi)[arguments]: Use 'modify-phases'.

Nothing to say. I think it could be combined with the previous commit,
but this is also not a problem.

...

Re: [PATCH 6/7] gnu: irssi: Use 'modify-phases'.

[Ricardo Wurmus]

Andreas Enge <andreas@enge.fr> writes:

> ...
>
> On Sun, Feb 28, 2016 at 12:10:11PM +0200, Efraim Flashner wrote:
>> * gnu/packages/irc.scm (irssi)[arguments]: Use 'modify-phases'.
>
> Nothing to say. I think it could be combined with the previous commit,
> but this is also not a problem.
>
> ...

I think it is good to keep syntax changes separate in general, but in
this case there doesn’t seem to be much value as the whole expression is
changed anyway (due to the move to a different module).

I still have a slight preference to keep the commit separate, though.

~~ Ricardo

[PATCH 7/7] gnu: weechat: Move to irc.scm.

[Efraim Flashner]

* gnu/packages/weechat.scm (weechat): Move from here ...
* gnu/packages/irc.scm (weechat): ... to here.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove weechat.scm.
---
 gnu-system.am            |   1 -
 gnu/packages/irc.scm     |  77 ++++++++++++++++++++++++++++++++++
 gnu/packages/weechat.scm | 106 -----------------------------------------------
 3 files changed, 77 insertions(+), 107 deletions(-)
 delete mode 100644 gnu/packages/weechat.scm

diff --git a/gnu-system.am b/gnu-system.am
index ee732c0..9cf67f3 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -337,7 +337,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/wdiff.scm			\
   gnu/packages/web.scm				\
   gnu/packages/webkit.scm			\
-  gnu/packages/weechat.scm			\
   gnu/packages/wget.scm				\
   gnu/packages/wicd.scm				\
   gnu/packages/wine.scm				\
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index b9ac572..4a14bcd 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
+;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -23,14 +25,28 @@
   #:use-module (guix packages)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages aspell)
+  #:use-module (gnu packages autogen)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages cyrus-sasl)
+  #:use-module (gnu packages file)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages lua)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages tcl)
   #:use-module (gnu packages tls))
 
 (define-public quassel
@@ -111,3 +127,64 @@ such as WeeChat or irssi, but graphical.")
      "Irssi is a terminal based IRC client for UNIX systems.  It also supports
 SILC and ICB protocols via plugins.")
     (license license:gpl2+)))
+
+(define-public weechat
+  (package
+    (name "weechat")
+    (version "1.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://weechat.org/files/src/weechat-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "19apd3hav77v74j7flicai0843k7wrkr2fd3q2ayvzkgnbrrp1ai"))
+              (patches (list (search-patch "weechat-python.patch")))))
+    (build-system gnu-build-system)
+    (native-inputs `(("autoconf" ,autoconf)
+                     ("pkg-config" ,pkg-config)
+                     ("file" ,file)
+                     ("autogen" ,autogen)
+                     ("automake" ,automake)
+                     ("libtool" ,libtool)))
+    (inputs `(("ncurses" ,ncurses)
+              ("diffutils" ,diffutils)
+              ("gettext" ,gnu-gettext)
+              ("libltdl" ,libltdl)
+              ("libgcrypt" ,libgcrypt "out")
+              ("zlib" ,zlib)
+              ("aspell" ,aspell)
+              ("curl" ,curl)
+              ("gnutls" ,gnutls)
+              ("guile" ,guile-2.0)
+              ("openssl" ,openssl)
+              ("cyrus-sasl" ,cyrus-sasl)
+              ("lua" ,lua-5.1)
+              ("python" ,python-2)
+              ("perl" ,perl)
+              ("tcl" ,tcl)))
+    (arguments
+     `(#:configure-flags (list (string-append
+                                "--with-tclconfig="
+                                (assoc-ref %build-inputs "tcl") "/lib"))
+       #:phases (modify-phases %standard-phases
+                  (add-before 'configure 'autogen
+                    (lambda _
+                      (zero? (system* "./autogen.sh"))))
+                  (add-before 'build 'set-python-file-name
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (substitute* "src/plugins/python/weechat-python.c"
+                        (("python2_bin = weechat_python_get_python2_bin.*;")
+                         (string-append "python2_bin = strdup (\""
+                                        (assoc-ref inputs "python")
+                                        "/bin/python\");\n")))
+                      #t)))))
+    (synopsis "Extensible chat client")
+    (description "WeeChat (Wee Enhanced Environment for Chat) is an
+Internet Relay Chat client, which is designed to be light and fast.
+The client uses a curses frontend, and there are remote interfaces
+for Web, Qt, Android and Emacs.  In WeeChat everything can be done
+with a keyboard, though it also supports mouse.  It is customizable
+and extensible with plugins and scripts.")
+    (home-page "http://www.weechat.org/")
+    (license license:gpl3)))
diff --git a/gnu/packages/weechat.scm b/gnu/packages/weechat.scm
deleted file mode 100644
index 7b833d0..0000000
--- a/gnu/packages/weechat.scm
+++ /dev/null
@@ -1,106 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
-;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; 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/>.
-
-;; TODO: Add ruby
-
-(define-module (gnu packages weechat)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages gettext)
-  #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages file)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages lua)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages tcl)
-  #:use-module (gnu packages aspell)
-  #:use-module (gnu packages curl)
-  #:use-module (gnu packages guile)
-  #:use-module (gnu packages cyrus-sasl)
-  #:use-module (gnu packages autogen)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages tls)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses) #:select (gpl3)))
-
-(define-public weechat
-  (package
-    (name "weechat")
-    (version "1.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://weechat.org/files/src/weechat-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "19apd3hav77v74j7flicai0843k7wrkr2fd3q2ayvzkgnbrrp1ai"))
-              (patches (list (search-patch "weechat-python.patch")))))
-    (build-system gnu-build-system)
-    (native-inputs `(("autoconf" ,autoconf)
-                     ("pkg-config" ,pkg-config)
-                     ("file" ,file)
-                     ("autogen" ,autogen)
-                     ("automake" ,automake)
-                     ("libtool" ,libtool)))
-    (inputs `(("ncurses" ,ncurses)
-              ("diffutils" ,diffutils)
-              ("gettext" ,gnu-gettext)
-              ("libltdl" ,libltdl)
-              ("libgcrypt" ,libgcrypt "out")
-              ("zlib" ,zlib)
-              ("aspell" ,aspell)
-              ("curl" ,curl)
-              ("gnutls" ,gnutls)
-              ("guile" ,guile-2.0)
-              ("openssl" ,openssl)
-              ("cyrus-sasl" ,cyrus-sasl)
-              ("lua" ,lua-5.1)
-              ("python" ,python-2)
-              ("perl" ,perl)
-              ("tcl" ,tcl)))
-    (arguments
-     `(#:configure-flags (list (string-append
-                                "--with-tclconfig="
-                                (assoc-ref %build-inputs "tcl") "/lib"))
-       #:phases (modify-phases %standard-phases
-                  (add-before 'configure 'autogen
-                    (lambda _
-                      (zero? (system* "./autogen.sh"))))
-                  (add-before 'build 'set-python-file-name
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (substitute* "src/plugins/python/weechat-python.c"
-                        (("python2_bin = weechat_python_get_python2_bin.*;")
-                         (string-append "python2_bin = strdup (\""
-                                        (assoc-ref inputs "python")
-                                        "/bin/python\");\n")))
-                      #t)))))
-    (synopsis "Extensible chat client")
-    (description "WeeChat (Wee Enhanced Environment for Chat) is an
-Internet Relay Chat client, which is designed to be light and fast.
-The client uses a curses frontend, and there are remote interfaces
-for Web, Qt, Android and Emacs.  In WeeChat everything can be done
-with a keyboard, though it also supports mouse.  It is customizable
-and extensible with plugins and scripts.")
-    (home-page "http://www.weechat.org/")
-    (license gpl3)))
-- 
2.7.0

Re: [PATCH 7/7] gnu: weechat: Move to irc.scm.

[Andreas Enge]

...

On Sun, Feb 28, 2016 at 12:10:12PM +0200, Efraim Flashner wrote:
> * gnu/packages/weechat.scm (weechat): Move from here ...
> * gnu/packages/irc.scm (weechat): ... to here.
> * gnu-system.am (GNU_SYSTEM_MODULES): Remove weechat.scm.

Again, mention the deleted file.

Thanks!

Andreas