From mboxrd@z Thu Jan 1 00:00:00 1970 From: gno Subject: Re: [PATCH] gnu: awesome: Add awesome-3.5 Date: Tue, 30 Aug 2016 10:52:08 +0200 Message-ID: <6f0c5726-12bf-50fd-470d-911d7c5177cd@gmail.com> References: <20160825030933.06c8d523@gmail.com> <20160830065610.GC4193@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beemF-0003tU-S8 for guix-devel@gnu.org; Tue, 30 Aug 2016 04:52:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1beemB-00014y-N4 for guix-devel@gnu.org; Tue, 30 Aug 2016 04:52:14 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beemB-00014o-DO for guix-devel@gnu.org; Tue, 30 Aug 2016 04:52:11 -0400 Received: by mail-wm0-x241.google.com with SMTP id i138so2133718wmf.3 for ; Tue, 30 Aug 2016 01:52:11 -0700 (PDT) In-Reply-To: <20160830065610.GC4193@jasmine> 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: Leo Famulari , guix-devel@gnu.org On 8/30/2016 8:56 AM, Leo Famulari wrote: > On Thu, Aug 25, 2016 at 03:09:33AM +0200, gno wrote: >> Sure hope I'm doing this right as I'm new to this. >> These patches add Awesome 3.5.9 to the repository. I decided against >> updating since it may break peoples configurations. Awesome had API >> changes in between 3.4 and 3.5. >> >> Please have a look. > Thanks for these patches! We need to figure out the Lua issue, and I've > replied in the Lua / Prosody thread. > >> Subject: [PATCH 2/3] gnu: lua: Add lua-lgi. >> >> * gnu/packages/lua.scm (lua-lgi): New variable. >> + (replace 'configure > I think we should just delete the configure phase if there is no > './configure' script. > >> + (lambda* (#:key inputs #:allow-other-keys) >> + ; needs to load cairo dynamically >> + (let* ((cairo (string-append >> + (assoc-ref inputs "cairo") "/lib" ))) >> + (setenv "LD_LIBRARY_PATH" cairo )) > This can go in a 'set-env' phase. > >> + >> + ; FIXME: Skip GTK tests: >> + ; gtk3 - can't get it to run with the xorg-server config below >> + ; and some non-gtk tests will also fail >> + ; gtk2 - lots of functions aren't implemented >> + ; We choose gtk2 as the lesser evil and simply skip the test. >> + ; as of 22/08/2016 awesome is the only package dependent on lgi but >> + ; it doesn't need or interact with gtk using lgi. >> + (substitute* "./tests/test.lua" >> + (("'gtk.lua',") "-- 'gtk.lua',")) > This should go in a 'disable-tests' phase. > >> + ; lua version and therefore install directories are hardcoded >> + (substitute* "./lgi/Makefile" >> + (("LUA_VERSION=5.1") "LUA_VERSION=5.2")) > Again, in its own phase. I'm not sure what to call it :) > >> + ;; There must be a running X server during tests. >> + (system (format #f "~a/bin/Xvfb :1 &" (assoc-ref inputs "xorg-server"))) >> + (setenv "DISPLAY" ":1")))) > This should go in a phase with a name like "start-x-server' before the > check phase. > >> + #:make-flags >> + (let ((out (assoc-ref %outputs "out"))) > Is binding this 'out' variable necessary when it gets recreated in the > string-append below? > >> + (list "CC=gcc" >> + (string-append "PREFIX=" (assoc-ref %outputs "out")))))) >> Subject: [PATCH 3/3] gnu: wm: Add awesome-3.5. >> >> * gnu/packages/wm.scm (awesome-3.5): New variable. >> +(define-public awesome-3.5 >> + (package (inherit awesome) >> + (version "3.5.9") > Is there upstream support for the 3.4 series? We shouldn't keep it if > it's unsupported, in my opinion. Personally, I'd be fine with a replacement instead. I just recently figured awesome was only added like a month or two ago. I didn't want to break peoples desktop, but I guess there aren't that many yet. > >> + (snippet >> + ;; Remove non-reproducible timestamp and use the date of the >> + ;; source file instead. > Thanks for paying attention to this issue. Our unwritten convention is > to take the value of the environment SOURCE_DATE_EPOCH. Can you do that > instead? There are examples in the Erlang package if you need them. > > Thanks again for these patches! > > Let's fix our Lua packaging. And, can you send revised versions of > patches 2 and 3 from this series? Working on it. I might nag you with questions soon. The snippet is just a lazy copy-paste from awesome 3.4 since my knowledge isn't where it should be yet. Thanks for all the advice ! :)