From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH] gnu: st: Mov to terminals.scm. Date: Sun, 07 Aug 2016 12:33:56 +0000 Message-ID: <871t20ahcb.fsf@we.make.ritual.n0.is> 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]:39571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWNHH-0006u6-AQ for guix-devel@gnu.org; Sun, 07 Aug 2016 08:34:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWNHE-0007av-JR for guix-devel@gnu.org; Sun, 07 Aug 2016 08:34:02 -0400 Received: from mithlond.libertad.in-berlin.de ([2001:67c:1400:2490::1]:42063 helo=beleriand.n0.is) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWNHE-0007ar-57 for guix-devel@gnu.org; Sun, 07 Aug 2016 08:34:00 -0400 Received: by beleriand.n0.is (OpenSMTPD) with ESMTPSA id afb51560 TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO for ; Sun, 7 Aug 2016 12:33:56 +0000 (UTC) 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: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-st-Move-to-terminals.scm.patch Content-Transfer-Encoding: quoted-printable From=203864654025329367b6f87ccfb12a4ff789d5155a Mon Sep 17 00:00:00 2001 From: ng0 Date: Sun, 7 Aug 2016 12:30:06 +0000 Subject: [PATCH] gnu: st: Move to terminals.scm. * gnu/packages/suckless.scm (st): Move from here ... * gnu/packages/terminals.scm (st): ... to here. =2D-- gnu/packages/suckless.scm | 50 +-----------------------------------------= -- gnu/packages/terminals.scm | 52 ++++++++++++++++++++++++++++++++++++++++++= +++- 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 8732a84..16e9146 100644 =2D-- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -28,10 +28,8 @@ #:use-module (gnu packages) #:use-module (gnu packages gnome) #:use-module (gnu packages xorg) =2D #:use-module (gnu packages fonts) #:use-module (gnu packages pkg-config) =2D #:use-module (gnu packages webkit) =2D #:use-module (gnu packages fontutils)) + #:use-module (gnu packages webkit)) =20 (define-public dwm (package @@ -126,52 +124,6 @@ numbers of user-defined menu items efficiently.") "Simple X session lock with trivial feedback on password entry.") (license license:x11))) =20 =2D(define-public st =2D (package =2D (name "st") =2D (version "0.6") =2D (source =2D (origin =2D (method url-fetch) =2D (uri (string-append "http://dl.suckless.org/st/st-" =2D version ".tar.gz")) =2D (sha256 =2D (base32 =2D "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5")))) =2D (build-system gnu-build-system) =2D (arguments =2D '(#:tests? #f ; no tests =2D #:make-flags (list "CC=3Dgcc" =2D (string-append "PREFIX=3D" %output)) =2D #:phases =2D (modify-phases %standard-phases =2D (delete 'configure) =2D (add-after 'unpack 'inhibit-terminfo-install =2D (lambda _ =2D (substitute* "Makefile" =2D (("\t@tic -s st.info") "")) =2D #t))))) =2D (inputs =2D `(("libx11" ,libx11) =2D ("libxft" ,libxft) =2D ("libxcomposite" ,libxcomposite) =2D ("compositeproto" ,compositeproto) =2D ("libxext" ,libxext) =2D ("xextproto" ,xextproto) =2D ("libxrender" ,libxrender) =2D ("fontconfig" ,fontconfig) =2D ("freetype" ,freetype) =2D ("font-liberation" ,font-liberation))) =2D (native-inputs `(("pkg-config" ,pkg-config))) =2D (home-page "http://st.suckless.org/") =2D (synopsis "Simple terminal emulator") =2D (description =2D "St implements a simple and lightweight terminal emulator. It =2Dimplements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste, =2Dantialiased fonts (using fontconfig), fallback fonts, resizing, and line =2Ddrawing.") =2D (license license:x11))) =2D (define-public surf (package (name "surf") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 98f0060..02cb9fa 100644 =2D-- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2015 Efraim Flashner ;;; Copyright =C2=A9 2016 Mckinley Olsen ;;; Copyright =C2=A9 2016 Alex Griffin +;;; Copyright =C2=A9 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +37,10 @@ #:use-module (gnu packages wm) #:use-module (gnu packages ncurses) #:use-module (gnu packages gtk) =2D #:use-module (gnu packages gnome)) + #:use-module (gnu packages gnome) + #:use-module (gnu packages xorg) + #:use-module (gnu packages fonts) + #:use-module (gnu packages fontutils)) =20 (define-public tilda (package @@ -159,3 +163,49 @@ insert mode and command mode where keybindings have di= fferent functions.") Forget screen recording apps and blurry video. Enjoy a lightweight, purely text-based approach to terminal recording.") (license license:gpl3))) + +(define-public st + (package + (name "st") + (version "0.6") + (source + (origin + (method url-fetch) + (uri (string-append "http://dl.suckless.org/st/st-" + version ".tar.gz")) + (sha256 + (base32 + "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no tests + #:make-flags (list "CC=3Dgcc" + (string-append "PREFIX=3D" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'inhibit-terminfo-install + (lambda _ + (substitute* "Makefile" + (("\t@tic -s st.info") "")) + #t))))) + (inputs + `(("libx11" ,libx11) + ("libxft" ,libxft) + ("libxcomposite" ,libxcomposite) + ("compositeproto" ,compositeproto) + ("libxext" ,libxext) + ("xextproto" ,xextproto) + ("libxrender" ,libxrender) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("font-liberation" ,font-liberation))) + (native-inputs `(("pkg-config" ,pkg-config))) + (home-page "http://st.suckless.org/") + (synopsis "Simple terminal emulator") + (description + "St implements a simple and lightweight terminal emulator. It +implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste, +antialiased fonts (using fontconfig), fallback fonts, resizing, and line +drawing.") + (license license:x11))) =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----- iQIcBAEBCgAGBQJXpyq0AAoJEAKilhUMIBgjORMQALIgbkugHABekgi7Kj0/fGHK IYCWo31yTP/O1DnY8Y15vXQiB9WXQfAGGJl3XE/mIroE6YiUe75U8/YSna/rffAM zuaEnwEKrEbXqQaclqhmRwHC+qUNsogjFe7YvVppY/x2t2QqXFCYesj6ji6WRVp+ dJG1fCAha1wwPe1jZ/wOIZhlrEwn+FEtwiqNberiYP8qnxCOh7sNZtO6OCrhfisJ YraSgrt0h5reWgsfEYL1grlHGSsryL10FsQVJ3rafMo1TG461YI/j8+VPAkMIj8A KS0dqO6uYZhReKyJ6L6htsj80RoZnsg4JmPHe1phyHoQASeOkhktvvvKvT8BwZxX Nc17k0pjUPqvLv+4yJ6jG4LACRiDcrMh0nLj1LJwRzsBVJ0aF6iae0tb4lI8hvNM +QCtV1zgRpH6kBzjk0GcAGG0YcKwsof7uG0hkVzS94pymRWkJQQs+56LzjP0SyLn yB8eq2iV6WSDnFutOWOrtpbiywwp6/Jy0UZCss9hSDHaLPASjSLFxg3d6P5WQI/C no5wm8EYW0qfVGpiYLIiwNGb6JKtg1e0JMehp/+Ih3UOfo8q6VXi4yWhiXspT4+f FtJuwH966dQYX8z3fudUcyHOarksqL1/eMy1OOuqs53spXRJFfD9cgROgSKSvyvU asDIuaAi/b1Sr0dopakO =zYa6 -----END PGP SIGNATURE----- --==-=-=--