From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:48849) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2d3s-0002au-AW for guix-patches@gnu.org; Tue, 27 Aug 2019 11:07:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2d3o-0008OV-Ib for guix-patches@gnu.org; Tue, 27 Aug 2019 11:07:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40485) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2d3o-0008OD-7W for guix-patches@gnu.org; Tue, 27 Aug 2019 11:07:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i2d3o-0001Es-02 for guix-patches@gnu.org; Tue, 27 Aug 2019 11:07:04 -0400 Subject: bug#37094: [PATCH 1-3/3] Add nomad Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Jan Nieuwenhuizen References: <85sgpwcoqz.fsf@disroot.org> <855zmqsyqg.fsf@disroot.org> Date: Tue, 27 Aug 2019 17:06:14 +0200 In-Reply-To: <855zmqsyqg.fsf@disroot.org> (Amar Singh's message of "Wed, 21 Aug 2019 14:04:47 +0530") Message-ID: <87ftlmabrt.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: Amar Singh Cc: 37094-done@debbugs.gnu.org, mike.rosset@gmail.com Amar Singh writes: Hello, > After a few suggestions from Mike and Janneke: > 1. Rename guile-emacsy --> emacsy-minimal > 2. Removed glib-or-gtk-build-system in patch 004 > > cheers, > amar > >>>From 7040563cb1386c672c75ddb141b235d5895adfdf Mon Sep 17 00:00:00 2001 > From: Amar Singh Your attachments start with an escaped `>From' line, it's long ago that I saw those in emails, any idea where they come from? > Date: Mon, 8 Jul 2019 12:04:56 +0530 > Subject: [PATCH 1/4] gnu: Add emacsy-minimal. > > * (guile-emacsy): New variable. ^extra space I have removed the extra space, we want just one here. > +++ b/gnu/packages/guile-xyz.scm > @@ -2377,6 +2377,36 @@ comes with a simple counter example using FreeGLUT= and browser examples > in C using Gtk+-3 and WebKitGtk.") > (license license:gpl3+))) I have added: @@ -21,6 +21,7 @@ ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby ;;; Copyright =C2=A9 2018 Eric Bavier ;;; Copyright =C2=A9 2019 swedebugia +;;; Copyright =C2=A9 2019 Amar Singh ;;; ;;; This file is part of GNU Guix. ;;; Note the use of =C2=A9 instead of (C), no `by' and a space after your name. For the rest, LGTM. >>>From ede5e0fd3234d82bd7158f0a58f58efc27d26850 Mon Sep 17 00:00:00 2001 > From: Amar Singh > Date: Wed, 10 Jul 2019 16:46:35 +0530 > Subject: [PATCH 3/4] gnu: Add nomad. > > * gnu/packages/guile-xyz.scm (nomad): New variable. > --- > gnu/packages/guile-xyz.scm | 91 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 91 insertions(+) > > diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm > index 77a765b52c..573dd461ad 100644 > --- a/gnu/packages/guile-xyz.scm > +++ b/gnu/packages/guile-xyz.scm > @@ -58,6 +58,7 @@ > #:use-module (gnu packages gperf) > #:use-module (gnu packages gtk) > #:use-module (gnu packages guile) > + #:use-module (gnu packages gnupg) I have put this in its alphabetical place @@ -56,6 +56,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) > + (version "v0.1.0-alpha") and from here on, merged Mike's update. >>>From b082d2b141f87f91330e8416c40622b6213c9c9c Mon Sep 17 00:00:00 2001 > From: Amar Singh > Date: Wed, 10 Jul 2019 16:45:50 +0530 > Subject: [PATCH 4/4] gnu: emacsy: cleanup build I have changed this to gnu: emacsy: Cleanup build. > fix conflicts; emacsy requires guile-2.2.4 but found guile-2.2.6 in profi= le etc. > > build: add phase 'wrap-binaries > bulid: glib-or-gtk-build-system wraps binaries to work with glib or gtk > propagated-inputs: remove all but glib-network and gsettings > --- > gnu/packages/guile-xyz.scm | 37 ++++++++++++++++++++++++++++++++----- > 1 file changed, 32 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm > index 573dd461ad..88fc2eef2a 100644 > --- a/gnu/packages/guile-xyz.scm > +++ b/gnu/packages/guile-xyz.scm > @@ -21,6 +21,7 @@ > ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby > ;;; Copyright =C2=A9 2018 Eric Bavier > ;;; Copyright =C2=A9 2019 swedebugia > +;;; Copyright (C) 2019 by Amar Singh Removed this bit, see remarks above. > + (propagated-inputs > + `(("glib-networking" ,glib-networking) > + ("gssettings-desktop-schemas" ,gsettings-desktop-schemas))) I have added ("glib" ,glib), which fixes Settings schema 'org.gnome.system.proxy' is not installed > + (add-after 'install 'wrap-binaries > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (effective (read-line > + (open-pipe* OPEN_READ > + "guile" "-c" > + "(display (effective-version= ))"))) > + (deps (map (cut assoc-ref inputs <>) '("guile-lib" "= guile-readline"))) > + (scm-path (map (cut string-append <> "/share/guile/s= ite/" effective) `(,out ,@deps))) > + (go-path (map (cut string-append <> "/lib/guile/" ef= fective "/site-ccache/") `(,out ,@deps))) I have reformatted this to not exceed 80 columns. Thanks, I'm very excited to have nomad in Guix! Pushed to master as 114f02bac47d86c04bf211e33864beffcde74aab Greetings, janneke --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com