From 5b4946180e26177ad574d23e1c52489e4a0576ee Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sun, 8 Jan 2017 20:08:15 +0100 Subject: gnu: prosody: Add OpenSSL and Coreutils to the PATH of programs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (prosody)[arguments]: In 'wrap-programs' phase, add 'openssl' and 'coreutils' to 'PATH'. Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 95c265b987..21928789c6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Efraim Flashner ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Andy Patterson -;;; Copyright © 2016 Clément Lassieur +;;; Copyright © 2016, 2017 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +39,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages aidc) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) + #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages crypto) #:use-module (gnu packages cyrus-sasl) @@ -546,22 +547,30 @@ (define-public prosody (if (string-prefix? "lua" label) directory #f))) inputs))) - (path (string-join - (map (lambda (path) - (string-append path "/share/lua/5.1/?.lua;" - path "/share/lua/5.1/?/?.lua")) - (cons out deps)) - ";")) - (cpath (string-join - (map (lambda (path) - (string-append path "/lib/lua/5.1/?.so;" - path "/lib/lua/5.1/?/?.so")) - (cons out deps)) - ";"))) + (lua-path (string-join + (map (lambda (path) + (string-append + path "/share/lua/5.1/?.lua;" + path "/share/lua/5.1/?/?.lua")) + (cons out deps)) + ";")) + (lua-cpath (string-join + (map (lambda (path) + (string-append + path "/lib/lua/5.1/?.so;" + path "/lib/lua/5.1/?/?.so")) + (cons out deps)) + ";")) + (openssl (assoc-ref inputs "openssl")) + (coreutils (assoc-ref inputs "coreutils")) + (path (map (lambda (dir) + (string-append dir "/bin")) + (list openssl coreutils)))) (for-each (lambda (file) (wrap-program file - `("LUA_PATH" ";" = (,path)) - `("LUA_CPATH" ";" = (,cpath)))) + `("LUA_PATH" ";" = (,lua-path)) + `("LUA_CPATH" ";" = (,lua-cpath)) + `("PATH" ":" prefix ,path))) (find-files bin ".*")) #t)))))) (inputs -- cgit v1.2.3 From 84bf2a2e74b3f40e150554d0f8d3bce1986b8089 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sun, 8 Jan 2017 20:08:16 +0100 Subject: gnu: prosody: Make config and data files visible to 'prosodyctl'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (prosody)[arguments]: Add a 'fix-makefile' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 21928789c6..2be3b09695 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -536,6 +536,14 @@ (define-public prosody (substitute* "configure" (("exit 1") "")) #t)) + (add-after 'unpack 'fix-makefile + (lambda _ + (substitute* "Makefile" + ;; prosodyctl needs to read the configuration file. + (("^INSTALLEDCONFIG =.*") "INSTALLEDCONFIG = /etc/prosody\n") + ;; prosodyctl needs a place to put auto-generated certificates. + (("^INSTALLEDDATA =.*") "INSTALLEDDATA = /var/lib/prosody\n")) + #t)) (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make sure all executables in "bin" find the required Lua -- cgit v1.2.3 From fdfb4b96044859198e0d16a05d42d4db08c02dd7 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 18 Jan 2017 12:34:24 +0000 Subject: gnu: Add loudmouth. * gnu/packages/messaging.scm (loudmouth): New variable. Signed-off-by: Marius Bakke --- gnu/packages/messaging.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2be3b09695..cded33a1ed 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Efraim Flashner -;;; Copyright © 2016 ng0 +;;; Copyright © 2016, 2017 ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017 Clément Lassieur ;;; @@ -1120,4 +1120,36 @@ (define-public psyclpc many bug fixes.") (license license:gpl2)))) +(define-public loudmouth + (package + (name "loudmouth") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://mcabber.com/files/loudmouth/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl")))) + (build-system gnu-build-system) + (inputs + `(("glib" ,glib) + ("gnutls" ,gnutls) + ("libidn" ,libidn))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("check" ,check) + ("glib" ,glib "bin") ; gtester + ("gtk-doc" ,gtk-doc))) + (home-page "https://mcabber.com/") + (description + "Loudmouth is a lightweight and easy-to-use C library for programming +with the XMPP (formerly known as Jabber) protocol. It is designed to be +easy to get started with and yet extensible to let you do anything the XMPP +protocol allows.") + (synopsis "Asynchronous XMPP library") + ;; The files have LGPL2.0+ headers, but COPYING specifies LGPL2.1. + (license license:lgpl2.0+))) + ;;; messaging.scm ends here -- cgit v1.2.3 From cd4a232dd59af49a5e23eee3c723226455aabfad Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 18 Jan 2017 12:34:25 +0000 Subject: gnu: Add mcabber. * gnu/packages/messaging.scm (mcabber): New variable. Co-authored-by: Marius Bakke --- gnu/packages/messaging.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cded33a1ed..0c88059dca 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -37,6 +37,7 @@ (define-module (gnu packages messaging) #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages aidc) + #:use-module (gnu packages aspell) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages base) @@ -1152,4 +1153,39 @@ (define-public loudmouth ;; The files have LGPL2.0+ headers, but COPYING specifies LGPL2.1. (license license:lgpl2.0+))) +(define-public mcabber + (package + (name "mcabber") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://mcabber.com/files/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags (list "--enable-otr" + "--enable-aspell"))) + (inputs + `(("gpgme" ,gpgme) + ("libotr" ,libotr) + ("aspell" ,aspell) + ("libidn" ,libidn) + ("glib" ,glib) + ("ncurses" ,ncurses) + ("loudmouth" ,loudmouth))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://mcabber.com") + (description + "Mcabber is a small XMPP (Jabber) console client, which includes features +such as SASL and TLS support, @dfn{Multi-User Chat} (MUC) support, logging, +command-completion, OpenPGP encryption, @dfn{Off-the-Record Messaging} (OTR) +support, and more.") + (synopsis "Small XMPP console client") + (license license:gpl2+))) + ;;; messaging.scm ends here -- cgit v1.2.3