Clément Lassieur <clement@lassieur.org> writes:

> * gnu/packages/messaging.scm (prosody): Update to 0.9.12.
>   [inputs]: Change lua5.1-sec-0.5 to lua5.1-sec.
> * gnu/packages/lua.scm (lua5.1-sec-0.5): Remove it.

Hi Clément,

The patch looks good, but I don't think removing the copyright is
necessary even if it is effectively a revert of the original
contribution. The code may have been copy-pasted or otherwised built
upon, so leaving it is better IMO.

Do you wish to remove it? Otherwise I'll simply drop that line.

Thanks!

> ---
>  gnu/packages/lua.scm       | 13 -------------
>  gnu/packages/messaging.scm |  7 +++----
>  2 files changed, 3 insertions(+), 17 deletions(-)
>
> diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
> index 5016732b7..35efaa496 100644
> --- a/gnu/packages/lua.scm
> +++ b/gnu/packages/lua.scm
> @@ -6,7 +6,6 @@
>  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
>  ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
> -;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
>  ;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
> @@ -283,18 +282,6 @@ communication.  It takes an already established TCP connection and creates a
>  secure session between the peers.")
>      (license (package-license lua-5.1))))
>  
> -(define-public lua5.1-sec-0.5
> -  (package
> -    (inherit lua5.1-sec)
> -    (version "0.5.1")
> -    (source (origin
> -              (method url-fetch)
> -              (uri (string-append "https://github.com/brunoos/luasec/archive/"
> -                                  "luasec-" version ".tar.gz"))
> -              (sha256
> -               (base32
> -                "01llf5bcrjmqqy6m65avqkajz7h79rvkka6rd131kwr10n75yp3d"))))))
> -
>  (define-public lua-lgi
>    (package
>      (name "lua-lgi")
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 9345e2426..0ffc031c8 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -495,14 +495,14 @@ end-to-end encryption support; XML console.")
>  (define-public prosody
>    (package
>      (name "prosody")
> -    (version "0.9.10")
> +    (version "0.9.12")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "https://prosody.im/downloads/source/"
>                                    "prosody-" version ".tar.gz"))
>                (sha256
>                 (base32
> -                "0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8"))))
> +                "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s"))))
>      (build-system gnu-build-system)
>      (arguments
>       `(#:tests? #f ; no "check" target
> @@ -572,8 +572,7 @@ end-to-end encryption support; XML console.")
>         ("lua5.1-expat" ,lua5.1-expat)
>         ("lua5.1-socket" ,lua5.1-socket)
>         ("lua5.1-filesystem" ,lua5.1-filesystem)
> -       ;; See <https://prosody.im/doc/depends#luasec>.
> -       ("lua5.1-sec" ,lua5.1-sec-0.5)))
> +       ("lua5.1-sec" ,lua5.1-sec)))
>      (home-page "https://prosody.im/")
>      (synopsis "Jabber (XMPP) server")
>      (description "Prosody is a modern XMPP communication server.  It aims to
> -- 
> 2.11.1