From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH] gnu: Add ircii. Date: Tue, 02 Aug 2016 15:19:20 +0000 Message-ID: <87d1lrtczr.fsf@we.make.ritual.n0.is> References: <87fuqoe10m.fsf@we.make.ritual.n0.is> <20160802005413.GB15847@jasmine> <87eg671gwq.fsf@member.fsf.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUbTl-0001tn-7V for guix-devel@gnu.org; Tue, 02 Aug 2016 11:19:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUbTi-0005rY-Mf for guix-devel@gnu.org; Tue, 02 Aug 2016 11:19:36 -0400 Received: from mithlond.libertad.in-berlin.de ([2001:67c:1400:2490::1]:43731 helo=beleriand.n0.is) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUbTi-0005qf-CN for guix-devel@gnu.org; Tue, 02 Aug 2016 11:19:34 -0400 In-Reply-To: <87eg671gwq.fsf@member.fsf.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: =?utf-8?B?5a6L5paH5q2m?= , Leo Famulari Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable =E5=AE=8B=E6=96=87=E6=AD=A6 writes: > Leo Famulari writes: > >> On Mon, Aug 01, 2016 at 07:34:49PM +0000, ng0 wrote: >>> * gnu/packages/irc.scm (ircii): New variable. >> >> Cool! >> >>> + (snippet >>> + '(begin >>> + (substitute* "bsdinstall" >>> + (("/bin/strip") "strip") >>> + (("/bin/cp") "cp") >>> + (("/bin/chmod") "chmod") >>> + (("/etc/chown") "chown") >>> + (("/bin/chgrp") "chgrp") >>> + (("/bin/mkdir") "mkdir") >>> + (("/bin/rm") "rm") >>> + (("/bin/mv") "mv")))))) >> >> Does anyone else think we should put this origin snippet in a build phase >> instead? Or, should we leave it in the origin, where it will be applied >> to the source code provided by `guix build --source ircii`? > I think it should be in snippet. The 'substitute*' doesn't introduce > any guix specified modifitions, it removes the hardcoded paths. > >> >>> + (delete 'check)))) >> >> Using '#:tests? #f' is preferred instead of deleting the check phase. >> >>> + (inputs >>> + `(("libiconv" ,libiconv) >>> + ("ncurses" ,ncurses) >>> + ("openssl" ,openssl))) >> >> I noticed that the built package does refer to libiconv: >> >> --- >> $ guix gc --references $(./pre-inst-env guix build ircii) >> /gnu/store/0kml8g9fix69v00afv59ngf4lgfr1565-openssl-1.0.2h >> /gnu/store/9maps38bsia0wcxm82h0v0p2dxyn8j35-ircii-20151120 >> /gnu/store/9nifwk709wajpyfwa0jzaa3p6mf10vxs-gcc-4.9.3-lib >> /gnu/store/m9vxvhdj691bq1f85lpflvnhcvrdilih-glibc-2.23 >> /gnu/store/xl19qrfzga52vrvp4ncccwjlnrjqwj95-ncurses-6.0 >> /gnu/store/ykzwykkvr2c80rw4l1qh3mvfdkl7jibi-bash-4.3.42 >> --- >> >> But, libiconv is used: >> >> --- >> $ strings /gnu/store/9maps38bsia0wcxm82h0v0p2dxyn8j35-ircii-20151120/bin= /irc | grep iconv >> iconv_close >> iconv >> iconv_open >> iconv_open@@GLIBC_2.2.5 >> iconv@@GLIBC_2.2.5 >> iconv_close@@GLIBC_2.2.5 >> --- >> >> Perhaps libiconv should be propagated? > The iconv functions are provided by glibc, libiconv is for systems that > do not use glibc. libiconv should be removed from inputs. For future references: As said on irc freenode.net, we might use libiconv if we run into problems with other libcs later. For now, I applied what you said, thanks. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Add-ircii.patch Content-Transfer-Encoding: quoted-printable From=2051542c0897a8f01af1a0507f8e243c1dec72a9c7 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 1 Aug 2016 19:31:23 +0000 Subject: [PATCH] gnu: Add ircii. * gnu/packages/irc.scm (ircii): New variable. =2D-- gnu/packages/irc.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 03f014a..97f015b 100644 =2D-- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -194,3 +194,56 @@ 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))) + +(define-public ircii + (package + (name "ircii") + (version "20151120") + (source (origin + (method url-fetch) + (uri (string-append "https://ircii.warped.com/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "178dc279f5j894qvp96dzz7c0jpryqlcqw5g0dc9yaxg9kgw1lqm")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-bsdinstall-absolute-path-bins + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "bsdinstall" + (("/bin/strip") "strip") + (("/bin/cp") "cp") + (("/bin/chmod") "chmod") + (("/etc/chown") "chown") + (("/bin/chgrp") "chgrp") + (("/bin/mkdir") "mkdir") + (("/bin/rm") "rm") + (("/bin/mv") "mv")))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ncurses (assoc-ref inputs "ncurses")) + (openssl (assoc-ref inputs "openssl"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* "./configure" + ;; TODO: find a socks4+5 lib with small size + ;; (string-append "--with-socks5=3D" ghc-socks) + (string-append "--prefix=3D" out) + (string-append "--enable-ipv6") + (string-append "--with-openssl=3D" openssl) + (string-append "--with-emacs-meta-keys"))))))))) + (inputs + `(("ncurses" ,ncurses) + ("openssl" ,openssl))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("perl" ,perl))) + (home-page "http://www.eterna.com.au/ircii/") + (synopsis "Terminal-based IRC and ICB client") + (description + "ircII is a terminal based IRC and ICB client for UNIX systems.") + (license license:bsd-3))) =2D-=20 2.9.2 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable =2D-=20 =E2=99=A5=E2=92=B6 ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJXoLn5AAoJEAKilhUMIBgjuyIP/2eMWBlQYJOk0D1Eg0dabmWx wTIoh1XN41IgjXlM/R86DqH5gL/LN/NPIkkgTxtQ5NcE0Z17nZfbsUVwDYhJWTEh 18hKfQAlVdbPrYgQJ4W1F0KHAz1PDjkgT3SZkaIs+6uIcqslBGw3QlaTWUnlQg1g bRiI/v/0/E/RUTl370TSo/THDborL627tP5GVzMpDyn+yj9CUYCYA0P5EdCOfz/p td8uX4IyxHvcAY3xzsWcQ4WPTelDnuhIKypNMTcJQwD+6+6CaAu2uv9fSZe7NvCF OZAIDJhn4m4MqWAS3Na1+S3tYp6P217IxpxjHTfeEZ01c0GpUb+1UVSebcyS0ZQa 3AJAWYFErY15HaSLurNGKe3Vy5+gLIuy3EcZ/zUXskgXEJPo3IM2qxEuyhleUvZd S3CRl+2iZZsRmrGVe8vEOPDh9zgB4X6xp1JsxMfNQv5SNrZx48GhcHQsmfpyH7Qw YdcYxteevikWYmU5fIp+olc7bvYlPBMdDBCpi1/fxRruq19vluQexFcXo9YTr+42 2FeLUFpg/k7EDdqK4H8PDy01tBKhAXI0YBv5F9WwwJMS3ygQBtsl43nnuzqqbqPl We/Ahh8RKS49D9E0nMdqaSCpWPAr9e1yDAh0PgkJW3XZcAf1eLZLrWmImQ9L1XfI /Bno1BGcSeqXTsu/y3q8 =Tqma -----END PGP SIGNATURE----- --==-=-=--