From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:34533) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijZnu-0007Ps-CY for guix-patches@gnu.org; Mon, 23 Dec 2019 21:20:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ijZnn-0007WD-M7 for guix-patches@gnu.org; Mon, 23 Dec 2019 21:20:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ijZnm-0007VG-Fd for guix-patches@gnu.org; Mon, 23 Dec 2019 21:20:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ijZnm-0003GL-CS for guix-patches@gnu.org; Mon, 23 Dec 2019 21:20:02 -0500 Subject: bug#38721: [PATCH] gnu: Add i3-gaps Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Brett Gilio References: <20191223085157.26468-1-brown121407@member.fsf.org> Date: Mon, 23 Dec 2019 20:19:33 -0600 In-Reply-To: <20191223085157.26468-1-brown121407@member.fsf.org> (Alexandru-Sergiu Marton's message of "Mon, 23 Dec 2019 10:51:57 +0200") Message-ID: <875zi6jwi2.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Alexandru-Sergiu Marton Cc: Alexandru-Sergiu Marton , 38721-done@debbugs.gnu.org Alexandru-Sergiu Marton writes: > * gnu/packages/wm.scm (i3-gaps): New variable. > --- > gnu/packages/wm.scm | 75 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 75 insertions(+) > > diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm > index 6c1919be56..904e2a3975 100644 > --- a/gnu/packages/wm.scm > +++ b/gnu/packages/wm.scm > @@ -30,6 +30,7 @@ > ;;; Copyright =C2=A9 2019 Evan Straw > ;;; Copyright =C2=A9 2019 Brett Gilio > ;;; Copyright =C2=A9 2019 Noodles! > +;;; Copyright =C2=A9 2019 Alexandru-Sergiu Marton > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -327,6 +328,80 @@ i3 primarily targets advanced users. Windows are ma= naged manually and organised > inside containers, which can be split vertically or horizontally, and op= tionally > resized. >=20=20 > +i3 uses a plain-text configuration file, and can be extended and control= led from > +many programming languages.") > + (license license:bsd-3))) > + > +(define-public i3-gaps > + (package > + (name "i3-gaps") > + (version "4.17.1") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://github.com/Airblader/i3/relea= ses/download/" > + version "/i3-" version ".tar.bz2")) > + (sha256 > + (base32 > + "0gqcr6s53dk3f2y9h6cna00rnwnh4yymk96li7lbym3d84cxjzrs"))= )) > + (build-system gnu-build-system) > + (arguments > + `(#:configure-flags > + ;; The build system tries to build in a separate directory, but t= hat > + ;; seems to be unnecessary. > + (list "--disable-builddir") > + > + ;; The test suite requires the unpackaged Xephyr X server. > + #:tests? #f > + #:phases > + (modify-phases %standard-phases > + (add-after 'install 'patch-session-file > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (i3 (string-append out "/bin/i3")) > + (i3-with-shmlog (string-append out "/bin/i3-with-shm= log"))) > + (substitute* (string-append out "/share/xsessions/i3.desk= top") > + (("Exec=3Di3") (string-append "Exec=3D" i3))) > + (substitute* (string-append out "/share/xsessions/i3-with= -shmlog.desktop") > + (("Exec=3Di3-with-shmlog") (string-append "Exec=3D" i3-= with-shmlog))) > + #t)))))) > + (inputs > + `(("libxcb" ,libxcb) > + ("xcb-util" ,xcb-util) > + ("xcb-util-cursor" ,xcb-util-cursor) > + ("xcb-util-keysyms" ,xcb-util-keysyms) > + ("xcb-util-wm" ,xcb-util-wm) > + ("xcb-util-xrm" ,xcb-util-xrm) > + ("libxkbcommon" ,libxkbcommon) > + ("libev" ,libev) > + ("libyajl" ,libyajl) > + ("asciidoc" ,asciidoc) > + ("xmlto" ,xmlto) > + ("perl-pod-simple" ,perl-pod-simple) > + ("libx11" ,libx11) > + ("pcre" ,pcre) > + ("startup-notification" ,startup-notification) > + ("pango" ,pango) > + ("cairo" ,cairo))) > + (native-inputs > + `(("which" ,which) > + ("perl" ,perl) > + ("pkg-config" ,pkg-config) > + ;; For building the documentation. > + ("libxml2" ,libxml2) > + ("docbook-xsl" ,docbook-xsl))) > + (home-page "https://github.com/Airblader/i3") > + (synopsis "Tiling window manager with gaps") > + (description "i3-gaps is a fork of i3wm, a tiling window manager for= X11. > +It is kept up to date with upstream, adding a few additional features su= ch > +as gaps between windows. > + > +i3 is a tiling X11 window manager that dynamically manages > +tiled, stacked, and tabbed window layouts. > + > +i3 primarily targets advanced users. Windows are managed manually and o= rganised > +inside containers, which can be split vertically or horizontally, and op= tionally > +resized. > + > i3 uses a plain-text configuration file, and can be extended and control= led from > many programming languages.") > (license license:bsd-3))) Hi, Alexandru-Sergiu Marton. Thank you for your patch. By the looks of it, this is your first patch submission to GNU Guix! Thank you. I want to offer you some kind advice. You may not be familiar with our inheritance mechanism. Since i3-gaps is really just a derivative form of core i3, we can actually just inherit the package parameters, arguments, inputs, etc. modifying only what we need to. In other-words, your definition can be /massively/ reduced as follows: --8<---------------cut here---------------start------------->8--- (define-public i3-gaps (package (inherit i3-wm) (name "i3-gaps") (version "4.17.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/Airblader/i3/releases/downlo= ad/" version "/i3-" version ".tar.bz2")) (sha256 (base32 "0iazv2i2rgmakzh95pgj6iapyzn7bdpcbcd35a79mhlml4ry33q= y")))) (build-system gnu-build-system) (home-page "https://github.com/Airblader/i3") (synopsis "Tiling window manager with gaps") (description "i3-gaps is a fork of i3wm, a tiling window manager for X11. It is kept up to date with upstream, adding a few additional features such as gaps between windows. i3 is a tiling X11 window manager that dynamically manages tiled, stacked, and tabbed window layouts. i3 primarily targets advanced users. Windows are managed manually and organised inside containers, which can be split vertically or horizontally, and optionally resized. i3 uses a plain-text configuration file, and can be extended and controlled from many programming languages.") (license license:bsd-3))) --8<---------------cut here---------------end--------------->8--- I went ahead and pushed this to master with you as the author, and me as a co-author. I used your email address for the git config. Again, welcome! We are happy to have you around. 88c9408070280db51d1a0e604b9ec77f1611ab3c. Closing. --=20 Brett M. Gilio GNU Guix, Contributor | GNU Project, Webmaster [DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE]