GNU bug report logs - #61518
Replace psi with psi-plus

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 61518 in the body.
You can then email your comments to 61518 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Remove psi.
Date: Tue, 14 Feb 2023 16:52:45 -0500

This package requires QtWebKit, which is being removed from Guix.

See <https://issues.guix.gnu.org/53289> for more information.

* gnu/packages/messaging.scm (psi): Remove variable.
---
 gnu/packages/messaging.scm | 56 --------------------------------------
 1 file changed, 56 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3027d56907..231ee1c5d3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -193,62 +193,6 @@ (define-public omemo-wget
 XMPP-based sessions.")
     (license license:lgpl3+)))
 
-(define-public psi
-  (package
-    (name "psi")
-    (version "1.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "mirror://sourceforge/psi/Psi/"
-                       version "/psi-" version ".tar.xz"))
-       (modules '((guix build utils)))
-       (snippet
-        `(begin
-           (delete-file-recursively "3rdparty")))
-       (sha256
-        (base32 "1dxmm1d1zr0pfs51lba732ipm6hm2357jlfb934lvarzsh7karri"))))
-    (build-system qt-build-system)
-    (arguments
-     `(#:tests? #f                      ; No target
-       #:configure-flags
-       (list
-        "-DUSE_ENCHANT=ON"
-        "-DUSE_CCACHE=OFF")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-cmake
-           (lambda _
-             (substitute* "cmake/modules/FindHunspell.cmake"
-               (("hunspell-1.6")
-                "hunspell-1.7"))
-             #t)))))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)
-       ("ruby" ,ruby)))
-    (inputs
-     `(("aspell" ,aspell)
-       ("enchant" ,enchant-1.6)
-       ("hunspell" ,hunspell)
-       ("libidn" ,libidn)
-       ("qca" ,qca)
-       ("qtbase" ,qtbase-5)
-       ("qtmultimedia-5" ,qtmultimedia-5)
-       ("qtsvg-5" ,qtsvg-5)
-       ("qtwebkit" ,qtwebkit)
-       ("qtx11extras" ,qtx11extras)
-       ("x11" ,libx11)
-       ("xext" ,libxext)
-       ("xcb" ,libxcb)
-       ("zlib" ,zlib)))
-    (synopsis "Qt-based XMPP Client")
-    (description "Psi is a capable XMPP client aimed at experienced users.
-Its design goals are simplicity and stability.")
-    (home-page "https://psi-im.org")
-    (license license:gpl2+)))
-
 (define-public libgnt
   (package
     (name "libgnt")
-- 
2.39.1

Message #10 received at 61518 <at> debbugs.gnu.org (full text, mbox):

From: Jack Hill <jackhill <at> jackhill.us>
To: Leo Famulari <leo <at> famulari.name>
Cc: 61518 <at> debbugs.gnu.org
Subject: Re: [bug#61518] [PATCH] gnu: Remove psi.
Date: Tue, 14 Feb 2023 17:07:58 -0500 (EST)

On Tue, 14 Feb 2023, Leo Famulari wrote:

> This package requires QtWebKit, which is being removed from Guix.
>
> See <https://issues.guix.gnu.org/53289> for more information.
>
> * gnu/packages/messaging.scm (psi): Remove variable.

Should we deprecate it in favor of psi-plus?

Best,
Jack

Message #13 received at 61518 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Jack Hill <jackhill <at> jackhill.us>
Cc: 61518 <at> debbugs.gnu.org
Subject: Re: [bug#61518] [PATCH] gnu: Remove psi.
Date: Tue, 14 Feb 2023 17:19:04 -0500

On Tue, Feb 14, 2023 at 05:07:58PM -0500, Jack Hill wrote:
> On Tue, 14 Feb 2023, Leo Famulari wrote:
> 
> > This package requires QtWebKit, which is being removed from Guix.
> > 
> > See <https://issues.guix.gnu.org/53289> for more information.
> > 
> > * gnu/packages/messaging.scm (psi): Remove variable.
> 
> Should we deprecate it in favor of psi-plus?

That's a good idea, thanks! Are you able to write a patch? :)

Message #16 received at 61518 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 61518 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: psi: Replace with psi-plus.
Date: Tue, 14 Feb 2023 17:31:40 -0500

This is required for <https://issues.guix.gnu.org/53289>.

* gnu/packages/messaging.scm (psi): Deprecate in favor of psi-plus.
---
 gnu/packages/messaging.scm | 59 ++------------------------------------
 1 file changed, 3 insertions(+), 56 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3027d56907..b6e7bc7cf1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -193,62 +193,6 @@ (define-public omemo-wget
 XMPP-based sessions.")
     (license license:lgpl3+)))
 
-(define-public psi
-  (package
-    (name "psi")
-    (version "1.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "mirror://sourceforge/psi/Psi/"
-                       version "/psi-" version ".tar.xz"))
-       (modules '((guix build utils)))
-       (snippet
-        `(begin
-           (delete-file-recursively "3rdparty")))
-       (sha256
-        (base32 "1dxmm1d1zr0pfs51lba732ipm6hm2357jlfb934lvarzsh7karri"))))
-    (build-system qt-build-system)
-    (arguments
-     `(#:tests? #f                      ; No target
-       #:configure-flags
-       (list
-        "-DUSE_ENCHANT=ON"
-        "-DUSE_CCACHE=OFF")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-cmake
-           (lambda _
-             (substitute* "cmake/modules/FindHunspell.cmake"
-               (("hunspell-1.6")
-                "hunspell-1.7"))
-             #t)))))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)
-       ("ruby" ,ruby)))
-    (inputs
-     `(("aspell" ,aspell)
-       ("enchant" ,enchant-1.6)
-       ("hunspell" ,hunspell)
-       ("libidn" ,libidn)
-       ("qca" ,qca)
-       ("qtbase" ,qtbase-5)
-       ("qtmultimedia-5" ,qtmultimedia-5)
-       ("qtsvg-5" ,qtsvg-5)
-       ("qtwebkit" ,qtwebkit)
-       ("qtx11extras" ,qtx11extras)
-       ("x11" ,libx11)
-       ("xext" ,libxext)
-       ("xcb" ,libxcb)
-       ("zlib" ,zlib)))
-    (synopsis "Qt-based XMPP Client")
-    (description "Psi is a capable XMPP client aimed at experienced users.
-Its design goals are simplicity and stability.")
-    (home-page "https://psi-im.org")
-    (license license:gpl2+)))
-
 (define-public libgnt
   (package
     (name "libgnt")
@@ -3142,6 +3086,9 @@ (define-public psi-plus
 designed for experienced users.")
     (license license:gpl2+)))
 
+(define-public psi
+  (deprecated-package "psi" psi-plus))
+
 (define-public python-zulip
   (package
     (name "python-zulip")
-- 
2.39.1

Message #23 received at 61518-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 61518-done <at> debbugs.gnu.org
Subject: Re: Replace psi with psi-plus
Date: Fri, 17 Feb 2023 14:52:04 -0500

Pushed as 7eb3eec4dacc414a6680a97bc6ef38c1f76b947e

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.