--- Begin Message ---
|
Subject: |
[PATCH 1-3/3] gnu: Add nomad. |
|
Date: |
Tue, 20 Aug 2019 12:22:36 +0530 |
>From the package description:
Nomad is an Emacs-like Web Browser built using Webkitgtk and
Emacsy. It has a small C backend and most browser features are fully
programmable in Guile. It has hooks, keymaps, and self documentation
features.
Though it requires a few changes to existing packages:
Patches:
1. Shroud related patches
a. update to 0.1.2: brings Guile-2.2 support
Related issue: https://issues.guix.gnu.org/issue/36576
2. Emacsy related patches
a. Add guile-emacsy package,
$ guix size emacsy ... total: 1136.3 MiB
versus:
$ guix size guile-emacsy ... total: 132.3 MiB
Related issue: https://issues.guix.gnu.org/issue/36151
(Discussion about "emacsy" vs "guile-emacsy" naming)
3. Nomad related patches
a. Add 'Nomad' package in guile-xyz.scm
4. [Optional] Emacsy package can also be cleaned up a bit, mostly
removal of propagated-inputs. Though that's a seperate issue.
[patch 04 attached]
Cheers,
amar
0001-gnu-Add-guile-emacsy.patch
Description: Text Data
0002-gnu-shroud-Update-to-0.1.2.patch
Description: Text Data
0003-gnu-Add-nomad.patch
Description: Text Data
0004-gnu-emacsy-cleanup-build.patch
Description: Text Data
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#37094] [PATCH 1-3/3] Add nomad |
|
Date: |
Tue, 27 Aug 2019 17:06:14 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) |
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 <address@hidden>
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 © 2018 Pierre-Antoine Rouby <address@hidden>
;;; Copyright © 2018 Eric Bavier <address@hidden>
;;; Copyright © 2019 swedebugia <address@hidden>
+;;; Copyright © 2019 Amar Singh <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
Note the use of © 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 <address@hidden>
> 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 <address@hidden>
> 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 profile
> 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 © 2018 Pierre-Antoine Rouby <address@hidden>
> ;;; Copyright © 2018 Eric Bavier <address@hidden>
> ;;; Copyright © 2019 swedebugia <address@hidden>
> +;;; Copyright (C) 2019 by Amar Singh<address@hidden>
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/site/" effective) `(,out ,@deps)))
> + (go-path (map (cut string-append <> "/lib/guile/"
> effective "/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
--
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
--- End Message ---