* [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3
@ 2020-09-03 13:47 Mike Rosset
2020-09-03 14:42 ` Mike Rosset
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Mike Rosset @ 2020-09-03 13:47 UTC (permalink / raw)
To: 43182; +Cc: Mike Rosset
* gnu/packages/guile-xyz.scm (nomad: ): Update to 0.2.0-alpha-100-g6a565d3.
* gnu/packages/guile-xyz.scm (g-golf): Update to 84e894eb7945c3bcdf7f8d5135c1be3efa524c92.
* gnu/packages/guile-xyz.scm (emacsy-minimal): Update to v0.4.1-31-g415d96f
This also improved Nomad's package declaration by remove all dependencies.
Simplifies wrapping and adds GST_PLUGIN_SYSTEM_PATH and GI_TYPELIB_PATH to the
wrap.
---
gnu/packages/guile-xyz.scm | 110 ++++++++++++++++---------------------
1 file changed, 48 insertions(+), 62 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index fa6855f43d..74b5c844dc 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1729,19 +1729,19 @@ capabilities.")
(license license:gpl3+)))
(define-public g-golf
- (let ((commit "5d2903afb4b6b65c22f587835d8fdff91916e5ee"))
+ (let ((commit "84e894eb7945c3bcdf7f8d5135c1be3efa524c92")
+ (revision "822")
+ (hash (base32 "1pkcij65zy2lkip5yrfzj85nq17pp9mrf0d4sk6hpjqr4kd0bxd5")))
(package
(name "g-golf")
- (version (git-version "1" "804" commit))
+ (version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/g-golf.git")
(commit commit)))
(file-name (git-file-name name version))
- (sha256
- (base32
- "1xkb6a5d3i9s8lpb5cf06bd64p5srqnnhn5l0b2f5csbvyz8hmmh"))))
+ (sha256 hash)))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -3009,7 +3009,8 @@ in C using Gtk+-3 and WebKitGtk.")
(license license:gpl3+)))
(define-public emacsy-minimal
- (let ((commit "v0.4.1-28-gd459ca1"))
+ (let ((commit "v0.4.1-31-g415d96f")
+ (hash (base32 "1cs1i1hxwrv0a512j54yrvfh743nci1chx6qjgp4jyzq98ncvxgg")))
(package
(inherit emacsy)
(name "emacsy-minimal")
@@ -3020,9 +3021,7 @@ in C using Gtk+-3 and WebKitGtk.")
(url "https://git.savannah.gnu.org/git/emacsy.git")
(commit commit)))
(file-name (git-file-name name version))
- (sha256
- (base32
- "1ps15w8cxj9kc18gmvys9jv9xa1qqa7m43ismv34l3cmhddrn0sr"))))
+ (sha256 hash)))
(build-system gnu-build-system)
(inputs
`(("guile" ,guile-2.2)
@@ -3075,7 +3074,7 @@ perform geometrical transforms on JPEG images.")
(define-public nomad
(package
(name "nomad")
- (version "0.2.0-alpha")
+ (version "0.2.0-alpha-100-g6a565d3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3084,7 +3083,7 @@ perform geometrical transforms on JPEG images.")
(file-name (git-file-name name version))
(sha256
(base32
- "1z2z5x37v1qrk2vb8qlz2yj030iirzzd0maa9fjxzlqkrg6krbaj"))))
+ "0anmprm63a88kii251rl296v1g4iq62r6n4nssx5jbc0hzkknanz"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -3095,36 +3094,35 @@ perform geometrical transforms on JPEG images.")
("guile" ,guile-2.2)
("glib:bin" ,glib "bin")
("texinfo" ,texinfo)
+ ("gettext" ,gnu-gettext)
("perl" ,perl)))
(inputs
- `(("guile" ,guile-2.2)
+ `(;; Guile
+ ("guile" ,guile-2.2)
("guile-lib" ,guile2.2-lib)
("guile-readline" ,guile2.2-readline)
("guile-gcrypt" ,guile2.2-gcrypt)
("gnutls" ,gnutls)
+ ("g-golf" ,g-golf)
("shroud" ,shroud)
("emacsy" ,emacsy-minimal)
+ ;; Gtk
("glib" ,glib)
("dbus-glib" ,dbus-glib)
+ ("glib-networking" ,glib-networking)
("gtk+" ,gtk+)
("gtk+:bin" ,gtk+ "bin")
- ("gtksourceview" ,gtksourceview)
("webkitgtk" ,webkitgtk)
- ("g-golf" ,g-golf)
- ("xorg-server" ,xorg-server)))
- (propagated-inputs
- `(("glib" ,glib)
- ("glib-networking" ,glib-networking)
+ ("gtksourceview" ,gtksourceview)
+ ("vte" ,vte)
+ ;; Gstreamer
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gst-plugins-bad" ,gst-plugins-bad)
("gst-plugins-ugly" ,gst-plugins-ugly)
- ("gtk+" ,gtk+)
- ("gtksourceview" ,gtksourceview)
- ("vte" ,vte)
- ("webkitgtk" ,webkitgtk)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
+ ;; Util
+ ("xorg-server" ,xorg-server)))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
@@ -3142,49 +3140,37 @@ perform geometrical transforms on JPEG images.")
#t))
(add-after 'install 'wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (gio-deps (map (cut assoc-ref inputs <>)
- '("glib-networking"
- "glib"
- "gstreamer"
- "gst-plugins-base"
- "gst-plugins-good"
- "gst-plugins-bad"
- "gst-plugins-ugly")))
- (gio-mod-path (map (cut string-append <>
- "/lib/gio/modules")
- gio-deps))
- (effective (read-line (open-pipe*
+ (let* ((out (assoc-ref outputs "out"))
+ (effective (read-line (open-pipe*
OPEN_READ
"guile" "-c"
"(display (effective-version))")))
- (deps (map (cut assoc-ref inputs <>)
- '("emacsy" "guile-lib" "guile-readline"
- "g-golf" "shroud")))
- (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)))
- (progs (map (cut string-append out "/bin/" <>)
- '("nomad"))))
- (map (cut wrap-program <>
- `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-path)
- `("GUILE_LOAD_PATH" ":" prefix ,scm-path)
- `("GUILE_LOAD_COMPILED_PATH" ":"
- prefix ,go-path))
- progs)
+ (gst-plugins (map (lambda (i)
+ (string-append (assoc-ref inputs i)
+ "/lib/gstreamer-1.0"))
+ `("gstreamer"
+ "gst-plugins-base"
+ "gst-plugins-good"
+ "gst-plugins-bad"
+ "gst-plugins-ugly")))
+ (out-append (lambda (. args)
+ (apply string-append out args)))
+ (gi-path (out-append "/lib/girepository-1.0"))
+ (load-path (out-append "/share/guile/site/" effective))
+ (comp-path (out-append "/lib/guile/" effective "/site-ccache"))
+ (ext-path (out-append "/libexec/nomad")))
+ (format #t "~s\n" gst-plugins)
+ (wrap-program (string-append out "/bin/nomad")
+ `("GUILE_LOAD_PATH" ":" prefix (,load-path
+ ,(getenv "GUILE_LOAD_PATH")))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+ (,comp-path
+ ,(getenv "GUILE_LOAD_COMPILED_PATH")))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-path ,(getenv "GI_TYPELIB_PATH")))
+ `("GIO_EXTRA_MODULES" ":" prefix (,(getenv "GIO_EXTRA_MODULES")))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
+ `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
#t))))))
- (native-search-paths
- (list (search-path-specification
- (variable "GI_TYPELIB_PATH")
- (separator ":")
- (files '("lib/girepository-1.0")))
- (search-path-specification
- (variable "NOMAD_WEB_EXTENSION_DIR")
- (separator ":")
- (files '("libexec/nomad")))))
(home-page "https://savannah.nongnu.org/projects/nomad/")
(synopsis "Extensible Web Browser in Guile Scheme")
(description "Nomad is a Emacs-like web browser that consists of a modular
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3
2020-09-03 13:47 [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 Mike Rosset
@ 2020-09-03 14:42 ` Mike Rosset
2020-09-03 14:48 ` Mike Rosset
2020-09-04 14:40 ` [bug#43182] [PATCH 1/3] gnu: emacsy-minimal: Update to v0.4.1-31-g415d96f Mike Rosset
2020-09-07 7:53 ` [bug#43182] [PATCH] " Mike Rosset
2 siblings, 1 reply; 15+ messages in thread
From: Mike Rosset @ 2020-09-03 14:42 UTC (permalink / raw)
To: 43182; +Cc: Mike Rosset
* gnu/packages/guile-xyz.scm (nomad: ): Update to 0.2.0-alpha-100-g6a565d3.
* gnu/packages/guile-xyz.scm (g-golf): Update to 84e894eb7945c3bcdf7f8d5135c1be3efa524c92.
* gnu/packages/guile-xyz.scm (emacsy-minimal): Update to v0.4.1-31-g415d96f
This also improved Nomad's package declaration by removing all propagated inputs.
Simplifies wrapping and adds GST_PLUGIN_SYSTEM_PATH and GI_TYPELIB_PATH to the
wrap.
---
gnu/packages/guile-xyz.scm | 109 ++++++++++++++++---------------------
1 file changed, 47 insertions(+), 62 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index fa6855f43d..afe6b9a07c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1729,19 +1729,19 @@ capabilities.")
(license license:gpl3+)))
(define-public g-golf
- (let ((commit "5d2903afb4b6b65c22f587835d8fdff91916e5ee"))
+ (let ((commit "84e894eb7945c3bcdf7f8d5135c1be3efa524c92")
+ (revision "822")
+ (hash (base32 "1pkcij65zy2lkip5yrfzj85nq17pp9mrf0d4sk6hpjqr4kd0bxd5")))
(package
(name "g-golf")
- (version (git-version "1" "804" commit))
+ (version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/g-golf.git")
(commit commit)))
(file-name (git-file-name name version))
- (sha256
- (base32
- "1xkb6a5d3i9s8lpb5cf06bd64p5srqnnhn5l0b2f5csbvyz8hmmh"))))
+ (sha256 hash)))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -3009,7 +3009,8 @@ in C using Gtk+-3 and WebKitGtk.")
(license license:gpl3+)))
(define-public emacsy-minimal
- (let ((commit "v0.4.1-28-gd459ca1"))
+ (let ((commit "v0.4.1-31-g415d96f")
+ (hash (base32 "1cs1i1hxwrv0a512j54yrvfh743nci1chx6qjgp4jyzq98ncvxgg")))
(package
(inherit emacsy)
(name "emacsy-minimal")
@@ -3020,9 +3021,7 @@ in C using Gtk+-3 and WebKitGtk.")
(url "https://git.savannah.gnu.org/git/emacsy.git")
(commit commit)))
(file-name (git-file-name name version))
- (sha256
- (base32
- "1ps15w8cxj9kc18gmvys9jv9xa1qqa7m43ismv34l3cmhddrn0sr"))))
+ (sha256 hash)))
(build-system gnu-build-system)
(inputs
`(("guile" ,guile-2.2)
@@ -3075,7 +3074,7 @@ perform geometrical transforms on JPEG images.")
(define-public nomad
(package
(name "nomad")
- (version "0.2.0-alpha")
+ (version "0.2.0-alpha-100-g6a565d3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3084,7 +3083,7 @@ perform geometrical transforms on JPEG images.")
(file-name (git-file-name name version))
(sha256
(base32
- "1z2z5x37v1qrk2vb8qlz2yj030iirzzd0maa9fjxzlqkrg6krbaj"))))
+ "0anmprm63a88kii251rl296v1g4iq62r6n4nssx5jbc0hzkknanz"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -3095,36 +3094,35 @@ perform geometrical transforms on JPEG images.")
("guile" ,guile-2.2)
("glib:bin" ,glib "bin")
("texinfo" ,texinfo)
+ ("gettext" ,gnu-gettext)
("perl" ,perl)))
(inputs
- `(("guile" ,guile-2.2)
+ `(;; Guile
+ ("guile" ,guile-2.2)
("guile-lib" ,guile2.2-lib)
("guile-readline" ,guile2.2-readline)
("guile-gcrypt" ,guile2.2-gcrypt)
("gnutls" ,gnutls)
+ ("g-golf" ,g-golf)
("shroud" ,shroud)
("emacsy" ,emacsy-minimal)
+ ;; Gtk
("glib" ,glib)
("dbus-glib" ,dbus-glib)
+ ("glib-networking" ,glib-networking)
("gtk+" ,gtk+)
("gtk+:bin" ,gtk+ "bin")
- ("gtksourceview" ,gtksourceview)
("webkitgtk" ,webkitgtk)
- ("g-golf" ,g-golf)
- ("xorg-server" ,xorg-server)))
- (propagated-inputs
- `(("glib" ,glib)
- ("glib-networking" ,glib-networking)
+ ("gtksourceview" ,gtksourceview)
+ ("vte" ,vte)
+ ;; Gstreamer
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gst-plugins-bad" ,gst-plugins-bad)
("gst-plugins-ugly" ,gst-plugins-ugly)
- ("gtk+" ,gtk+)
- ("gtksourceview" ,gtksourceview)
- ("vte" ,vte)
- ("webkitgtk" ,webkitgtk)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
+ ;; Util
+ ("xorg-server" ,xorg-server)))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
@@ -3142,49 +3140,36 @@ perform geometrical transforms on JPEG images.")
#t))
(add-after 'install 'wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (gio-deps (map (cut assoc-ref inputs <>)
- '("glib-networking"
- "glib"
- "gstreamer"
- "gst-plugins-base"
- "gst-plugins-good"
- "gst-plugins-bad"
- "gst-plugins-ugly")))
- (gio-mod-path (map (cut string-append <>
- "/lib/gio/modules")
- gio-deps))
- (effective (read-line (open-pipe*
+ (let* ((out (assoc-ref outputs "out"))
+ (effective (read-line (open-pipe*
OPEN_READ
"guile" "-c"
"(display (effective-version))")))
- (deps (map (cut assoc-ref inputs <>)
- '("emacsy" "guile-lib" "guile-readline"
- "g-golf" "shroud")))
- (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)))
- (progs (map (cut string-append out "/bin/" <>)
- '("nomad"))))
- (map (cut wrap-program <>
- `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-path)
- `("GUILE_LOAD_PATH" ":" prefix ,scm-path)
- `("GUILE_LOAD_COMPILED_PATH" ":"
- prefix ,go-path))
- progs)
+ (gst-plugins (map (lambda (i)
+ (string-append (assoc-ref inputs i)
+ "/lib/gstreamer-1.0"))
+ `("gstreamer"
+ "gst-plugins-base"
+ "gst-plugins-good"
+ "gst-plugins-bad"
+ "gst-plugins-ugly")))
+ (out-append (lambda (. args)
+ (apply string-append out args)))
+ (gi-path (out-append "/lib/girepository-1.0"))
+ (load-path (out-append "/share/guile/site/" effective))
+ (comp-path (out-append "/lib/guile/" effective "/site-ccache"))
+ (ext-path (out-append "/libexec/nomad")))
+ (wrap-program (string-append out "/bin/nomad")
+ `("GUILE_LOAD_PATH" ":" prefix (,load-path
+ ,(getenv "GUILE_LOAD_PATH")))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+ (,comp-path
+ ,(getenv "GUILE_LOAD_COMPILED_PATH")))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-path ,(getenv "GI_TYPELIB_PATH")))
+ `("GIO_EXTRA_MODULES" ":" prefix (,(getenv "GIO_EXTRA_MODULES")))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
+ `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
#t))))))
- (native-search-paths
- (list (search-path-specification
- (variable "GI_TYPELIB_PATH")
- (separator ":")
- (files '("lib/girepository-1.0")))
- (search-path-specification
- (variable "NOMAD_WEB_EXTENSION_DIR")
- (separator ":")
- (files '("libexec/nomad")))))
(home-page "https://savannah.nongnu.org/projects/nomad/")
(synopsis "Extensible Web Browser in Guile Scheme")
(description "Nomad is a Emacs-like web browser that consists of a modular
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3
2020-09-03 14:42 ` Mike Rosset
@ 2020-09-03 14:48 ` Mike Rosset
2020-09-04 6:17 ` Mathieu Othacehe
0 siblings, 1 reply; 15+ messages in thread
From: Mike Rosset @ 2020-09-03 14:48 UTC (permalink / raw)
To: 43182; +Cc: Mike Rosset
Mike Rosset <mike.rosset@gmail.com> writes:
> * gnu/packages/guile-xyz.scm (nomad: ): Update to 0.2.0-alpha-100-g6a565d3.
> * gnu/packages/guile-xyz.scm (g-golf): Update to 84e894eb7945c3bcdf7f8d5135c1be3efa524c92.
> * gnu/packages/guile-xyz.scm (emacsy-minimal): Update to v0.4.1-31-g415d96f
>
> This also improved Nomad's package declaration by removing all propagated inputs.
> Simplifies wrapping and adds GST_PLUGIN_SYSTEM_PATH and GI_TYPELIB_PATH to the
> wrap.
> ---
> gnu/packages/guile-xyz.scm | 109 ++++++++++++++++---------------------
> 1 file changed, 47 insertions(+), 62 deletions(-)
>
> diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
> index fa6855f43d..afe6b9a07c 100644
> --- a/gnu/packages/guile-xyz.scm
> +++ b/gnu/packages/guile-xyz.scm
> @@ -1729,19 +1729,19 @@ capabilities.")
> (license license:gpl3+)))
>
> (define-public g-golf
> - (let ((commit "5d2903afb4b6b65c22f587835d8fdff91916e5ee"))
> + (let ((commit "84e894eb7945c3bcdf7f8d5135c1be3efa524c92")
> + (revision "822")
> + (hash (base32 "1pkcij65zy2lkip5yrfzj85nq17pp9mrf0d4sk6hpjqr4kd0bxd5")))
> (package
> (name "g-golf")
> - (version (git-version "1" "804" commit))
> + (version (git-version "0.1.0" revision commit))
> (source (origin
> (method git-fetch)
> (uri (git-reference
> (url "https://git.savannah.gnu.org/git/g-golf.git")
> (commit commit)))
> (file-name (git-file-name name version))
> - (sha256
> - (base32
> - "1xkb6a5d3i9s8lpb5cf06bd64p5srqnnhn5l0b2f5csbvyz8hmmh"))))
> + (sha256 hash)))
> (build-system gnu-build-system)
> (native-inputs
> `(("autoconf" ,autoconf)
> @@ -3009,7 +3009,8 @@ in C using Gtk+-3 and WebKitGtk.")
> (license license:gpl3+)))
>
> (define-public emacsy-minimal
> - (let ((commit "v0.4.1-28-gd459ca1"))
> + (let ((commit "v0.4.1-31-g415d96f")
> + (hash (base32 "1cs1i1hxwrv0a512j54yrvfh743nci1chx6qjgp4jyzq98ncvxgg")))
> (package
> (inherit emacsy)
> (name "emacsy-minimal")
> @@ -3020,9 +3021,7 @@ in C using Gtk+-3 and WebKitGtk.")
> (url "https://git.savannah.gnu.org/git/emacsy.git")
> (commit commit)))
> (file-name (git-file-name name version))
> - (sha256
> - (base32
> - "1ps15w8cxj9kc18gmvys9jv9xa1qqa7m43ismv34l3cmhddrn0sr"))))
> + (sha256 hash)))
> (build-system gnu-build-system)
> (inputs
> `(("guile" ,guile-2.2)
> @@ -3075,7 +3074,7 @@ perform geometrical transforms on JPEG images.")
> (define-public nomad
> (package
> (name "nomad")
> - (version "0.2.0-alpha")
> + (version "0.2.0-alpha-100-g6a565d3")
> (source (origin
> (method git-fetch)
> (uri (git-reference
> @@ -3084,7 +3083,7 @@ perform geometrical transforms on JPEG images.")
> (file-name (git-file-name name version))
> (sha256
> (base32
> - "1z2z5x37v1qrk2vb8qlz2yj030iirzzd0maa9fjxzlqkrg6krbaj"))))
> + "0anmprm63a88kii251rl296v1g4iq62r6n4nssx5jbc0hzkknanz"))))
> (build-system gnu-build-system)
> (native-inputs
> `(("autoconf" ,autoconf)
> @@ -3095,36 +3094,35 @@ perform geometrical transforms on JPEG images.")
> ("guile" ,guile-2.2)
> ("glib:bin" ,glib "bin")
> ("texinfo" ,texinfo)
> + ("gettext" ,gnu-gettext)
> ("perl" ,perl)))
> (inputs
> - `(("guile" ,guile-2.2)
> + `(;; Guile
> + ("guile" ,guile-2.2)
> ("guile-lib" ,guile2.2-lib)
> ("guile-readline" ,guile2.2-readline)
> ("guile-gcrypt" ,guile2.2-gcrypt)
> ("gnutls" ,gnutls)
> + ("g-golf" ,g-golf)
> ("shroud" ,shroud)
> ("emacsy" ,emacsy-minimal)
> + ;; Gtk
> ("glib" ,glib)
> ("dbus-glib" ,dbus-glib)
> + ("glib-networking" ,glib-networking)
> ("gtk+" ,gtk+)
> ("gtk+:bin" ,gtk+ "bin")
> - ("gtksourceview" ,gtksourceview)
> ("webkitgtk" ,webkitgtk)
> - ("g-golf" ,g-golf)
> - ("xorg-server" ,xorg-server)))
> - (propagated-inputs
> - `(("glib" ,glib)
> - ("glib-networking" ,glib-networking)
> + ("gtksourceview" ,gtksourceview)
> + ("vte" ,vte)
> + ;; Gstreamer
> ("gstreamer" ,gstreamer)
> ("gst-plugins-base" ,gst-plugins-base)
> ("gst-plugins-good" ,gst-plugins-good)
> ("gst-plugins-bad" ,gst-plugins-bad)
> ("gst-plugins-ugly" ,gst-plugins-ugly)
> - ("gtk+" ,gtk+)
> - ("gtksourceview" ,gtksourceview)
> - ("vte" ,vte)
> - ("webkitgtk" ,webkitgtk)
> - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
> + ;; Util
> + ("xorg-server" ,xorg-server)))
> (arguments
> `(#:modules ((guix build gnu-build-system)
> (guix build utils)
> @@ -3142,49 +3140,36 @@ perform geometrical transforms on JPEG images.")
> #t))
> (add-after 'install 'wrap-binaries
> (lambda* (#:key inputs outputs #:allow-other-keys)
> - (let* ((out (assoc-ref outputs "out"))
> - (gio-deps (map (cut assoc-ref inputs <>)
> - '("glib-networking"
> - "glib"
> - "gstreamer"
> - "gst-plugins-base"
> - "gst-plugins-good"
> - "gst-plugins-bad"
> - "gst-plugins-ugly")))
> - (gio-mod-path (map (cut string-append <>
> - "/lib/gio/modules")
> - gio-deps))
> - (effective (read-line (open-pipe*
> + (let* ((out (assoc-ref outputs "out"))
> + (effective (read-line (open-pipe*
> OPEN_READ
> "guile" "-c"
> "(display (effective-version))")))
> - (deps (map (cut assoc-ref inputs <>)
> - '("emacsy" "guile-lib" "guile-readline"
> - "g-golf" "shroud")))
> - (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)))
> - (progs (map (cut string-append out "/bin/" <>)
> - '("nomad"))))
> - (map (cut wrap-program <>
> - `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-path)
> - `("GUILE_LOAD_PATH" ":" prefix ,scm-path)
> - `("GUILE_LOAD_COMPILED_PATH" ":"
> - prefix ,go-path))
> - progs)
> + (gst-plugins (map (lambda (i)
> + (string-append (assoc-ref inputs i)
> + "/lib/gstreamer-1.0"))
> + `("gstreamer"
> + "gst-plugins-base"
> + "gst-plugins-good"
> + "gst-plugins-bad"
> + "gst-plugins-ugly")))
> + (out-append (lambda (. args)
> + (apply string-append out args)))
> + (gi-path (out-append "/lib/girepository-1.0"))
> + (load-path (out-append "/share/guile/site/" effective))
> + (comp-path (out-append "/lib/guile/" effective "/site-ccache"))
> + (ext-path (out-append "/libexec/nomad")))
> + (wrap-program (string-append out "/bin/nomad")
> + `("GUILE_LOAD_PATH" ":" prefix (,load-path
> + ,(getenv "GUILE_LOAD_PATH")))
> + `("GUILE_LOAD_COMPILED_PATH" ":" prefix
> + (,comp-path
> + ,(getenv "GUILE_LOAD_COMPILED_PATH")))
> + `("GI_TYPELIB_PATH" ":" prefix (,gi-path ,(getenv "GI_TYPELIB_PATH")))
> + `("GIO_EXTRA_MODULES" ":" prefix (,(getenv "GIO_EXTRA_MODULES")))
> + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
> + `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
> #t))))))
> - (native-search-paths
> - (list (search-path-specification
> - (variable "GI_TYPELIB_PATH")
> - (separator ":")
> - (files '("lib/girepository-1.0")))
> - (search-path-specification
> - (variable "NOMAD_WEB_EXTENSION_DIR")
> - (separator ":")
> - (files '("libexec/nomad")))))
> (home-page "https://savannah.nongnu.org/projects/nomad/")
> (synopsis "Extensible Web Browser in Guile Scheme")
> (description "Nomad is a Emacs-like web browser that consists of a modular
Please use this patch the first patch was prematurely mailed. This has the
correct commit message and a debugging format removed. Please forgive
my git mail etiquette.
Mike
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3
2020-09-03 14:48 ` Mike Rosset
@ 2020-09-04 6:17 ` Mathieu Othacehe
0 siblings, 0 replies; 15+ messages in thread
From: Mathieu Othacehe @ 2020-09-04 6:17 UTC (permalink / raw)
To: Mike Rosset; +Cc: 43182
Hello Mike,
> Please use this patch the first patch was prematurely mailed. This has the
> correct commit message and a debugging format removed. Please forgive
> my git mail etiquette.
Sure. Could you please split this patch into three different ones, i.e
one per updated package?
Thanks,
Mathieu
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH 1/3] gnu: emacsy-minimal: Update to v0.4.1-31-g415d96f.
2020-09-03 13:47 [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 Mike Rosset
2020-09-03 14:42 ` Mike Rosset
@ 2020-09-04 14:40 ` Mike Rosset
2020-09-04 14:40 ` [bug#43182] [PATCH 2/3] gnu: g-golf: Update to git hash 84e894e Mike Rosset
2020-09-04 14:40 ` [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 Mike Rosset
2020-09-07 7:53 ` [bug#43182] [PATCH] " Mike Rosset
2 siblings, 2 replies; 15+ messages in thread
From: Mike Rosset @ 2020-09-04 14:40 UTC (permalink / raw)
To: 43182; +Cc: Mike Rosset
* gnu/packages/guile-xyz.scm (emacsy-minimal): Update to v0.4.1-31-g415d96f.
Emacsy now includes trivial fixes for 'end-of-line to be on par with Emacs
'end-of-line.
---
gnu/packages/guile-xyz.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index fa6855f43d..b43c72dcf3 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3009,7 +3009,8 @@ in C using Gtk+-3 and WebKitGtk.")
(license license:gpl3+)))
(define-public emacsy-minimal
- (let ((commit "v0.4.1-28-gd459ca1"))
+ (let ((commit "v0.4.1-31-g415d96f")
+ (hash (base32 "1cs1i1hxwrv0a512j54yrvfh743nci1chx6qjgp4jyzq98ncvxgg")))
(package
(inherit emacsy)
(name "emacsy-minimal")
@@ -3020,9 +3021,7 @@ in C using Gtk+-3 and WebKitGtk.")
(url "https://git.savannah.gnu.org/git/emacsy.git")
(commit commit)))
(file-name (git-file-name name version))
- (sha256
- (base32
- "1ps15w8cxj9kc18gmvys9jv9xa1qqa7m43ismv34l3cmhddrn0sr"))))
+ (sha256 hash)))
(build-system gnu-build-system)
(inputs
`(("guile" ,guile-2.2)
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH 2/3] gnu: g-golf: Update to git hash 84e894e.
2020-09-04 14:40 ` [bug#43182] [PATCH 1/3] gnu: emacsy-minimal: Update to v0.4.1-31-g415d96f Mike Rosset
@ 2020-09-04 14:40 ` Mike Rosset
2020-09-04 14:40 ` [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 Mike Rosset
1 sibling, 0 replies; 15+ messages in thread
From: Mike Rosset @ 2020-09-04 14:40 UTC (permalink / raw)
To: 43182; +Cc: Mike Rosset
* gnu/packages/guile-xyz.scm (g-golf): Update to git hash 84e894eb.
This also fixes the version to the correct one which is 0.1.0. Technically
g-golf does not actually have a release yet. The author of g-golf confirmed
versions will start at 0.1.0 as autotools currently has that version.
Note: this could break guix upgrade since version 0.1.0 is lower then 1. But
it's better to fix this now then later. Since they are few if any g-golf
users.
---
gnu/packages/guile-xyz.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b43c72dcf3..5164dc91c5 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1729,19 +1729,19 @@ capabilities.")
(license license:gpl3+)))
(define-public g-golf
- (let ((commit "5d2903afb4b6b65c22f587835d8fdff91916e5ee"))
+ (let ((commit "84e894eb7945c3bcdf7f8d5135c1be3efa524c92")
+ (revision "822")
+ (hash (base32 "1pkcij65zy2lkip5yrfzj85nq17pp9mrf0d4sk6hpjqr4kd0bxd5")))
(package
(name "g-golf")
- (version (git-version "1" "804" commit))
+ (version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/g-golf.git")
(commit commit)))
(file-name (git-file-name name version))
- (sha256
- (base32
- "1xkb6a5d3i9s8lpb5cf06bd64p5srqnnhn5l0b2f5csbvyz8hmmh"))))
+ (sha256 hash)))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.
2020-09-04 14:40 ` [bug#43182] [PATCH 1/3] gnu: emacsy-minimal: Update to v0.4.1-31-g415d96f Mike Rosset
2020-09-04 14:40 ` [bug#43182] [PATCH 2/3] gnu: g-golf: Update to git hash 84e894e Mike Rosset
@ 2020-09-04 14:40 ` Mike Rosset
2020-09-07 6:10 ` Mathieu Othacehe
1 sibling, 1 reply; 15+ messages in thread
From: Mike Rosset @ 2020-09-04 14:40 UTC (permalink / raw)
To: 43182; +Cc: Mike Rosset
* gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha-100-g6a565d3.
This also removes all propagated inputs and instead uses wrapping for search
paths.
Wrapping has been simplified and now adds NOMAD_WEB_EXTENSION_DIR,
GI_TYPELIB_PATH and GST_PLUGIN_SYSTEM_PATH environment variables.
---
gnu/packages/guile-xyz.scm | 92 ++++++++++++++++----------------------
1 file changed, 39 insertions(+), 53 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 5164dc91c5..afe6b9a07c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3074,7 +3074,7 @@ perform geometrical transforms on JPEG images.")
(define-public nomad
(package
(name "nomad")
- (version "0.2.0-alpha")
+ (version "0.2.0-alpha-100-g6a565d3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3083,7 +3083,7 @@ perform geometrical transforms on JPEG images.")
(file-name (git-file-name name version))
(sha256
(base32
- "1z2z5x37v1qrk2vb8qlz2yj030iirzzd0maa9fjxzlqkrg6krbaj"))))
+ "0anmprm63a88kii251rl296v1g4iq62r6n4nssx5jbc0hzkknanz"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -3094,36 +3094,35 @@ perform geometrical transforms on JPEG images.")
("guile" ,guile-2.2)
("glib:bin" ,glib "bin")
("texinfo" ,texinfo)
+ ("gettext" ,gnu-gettext)
("perl" ,perl)))
(inputs
- `(("guile" ,guile-2.2)
+ `(;; Guile
+ ("guile" ,guile-2.2)
("guile-lib" ,guile2.2-lib)
("guile-readline" ,guile2.2-readline)
("guile-gcrypt" ,guile2.2-gcrypt)
("gnutls" ,gnutls)
+ ("g-golf" ,g-golf)
("shroud" ,shroud)
("emacsy" ,emacsy-minimal)
+ ;; Gtk
("glib" ,glib)
("dbus-glib" ,dbus-glib)
+ ("glib-networking" ,glib-networking)
("gtk+" ,gtk+)
("gtk+:bin" ,gtk+ "bin")
- ("gtksourceview" ,gtksourceview)
("webkitgtk" ,webkitgtk)
- ("g-golf" ,g-golf)
- ("xorg-server" ,xorg-server)))
- (propagated-inputs
- `(("glib" ,glib)
- ("glib-networking" ,glib-networking)
+ ("gtksourceview" ,gtksourceview)
+ ("vte" ,vte)
+ ;; Gstreamer
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gst-plugins-bad" ,gst-plugins-bad)
("gst-plugins-ugly" ,gst-plugins-ugly)
- ("gtk+" ,gtk+)
- ("gtksourceview" ,gtksourceview)
- ("vte" ,vte)
- ("webkitgtk" ,webkitgtk)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
+ ;; Util
+ ("xorg-server" ,xorg-server)))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
@@ -3141,49 +3140,36 @@ perform geometrical transforms on JPEG images.")
#t))
(add-after 'install 'wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (gio-deps (map (cut assoc-ref inputs <>)
- '("glib-networking"
- "glib"
- "gstreamer"
- "gst-plugins-base"
- "gst-plugins-good"
- "gst-plugins-bad"
- "gst-plugins-ugly")))
- (gio-mod-path (map (cut string-append <>
- "/lib/gio/modules")
- gio-deps))
- (effective (read-line (open-pipe*
+ (let* ((out (assoc-ref outputs "out"))
+ (effective (read-line (open-pipe*
OPEN_READ
"guile" "-c"
"(display (effective-version))")))
- (deps (map (cut assoc-ref inputs <>)
- '("emacsy" "guile-lib" "guile-readline"
- "g-golf" "shroud")))
- (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)))
- (progs (map (cut string-append out "/bin/" <>)
- '("nomad"))))
- (map (cut wrap-program <>
- `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-path)
- `("GUILE_LOAD_PATH" ":" prefix ,scm-path)
- `("GUILE_LOAD_COMPILED_PATH" ":"
- prefix ,go-path))
- progs)
+ (gst-plugins (map (lambda (i)
+ (string-append (assoc-ref inputs i)
+ "/lib/gstreamer-1.0"))
+ `("gstreamer"
+ "gst-plugins-base"
+ "gst-plugins-good"
+ "gst-plugins-bad"
+ "gst-plugins-ugly")))
+ (out-append (lambda (. args)
+ (apply string-append out args)))
+ (gi-path (out-append "/lib/girepository-1.0"))
+ (load-path (out-append "/share/guile/site/" effective))
+ (comp-path (out-append "/lib/guile/" effective "/site-ccache"))
+ (ext-path (out-append "/libexec/nomad")))
+ (wrap-program (string-append out "/bin/nomad")
+ `("GUILE_LOAD_PATH" ":" prefix (,load-path
+ ,(getenv "GUILE_LOAD_PATH")))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+ (,comp-path
+ ,(getenv "GUILE_LOAD_COMPILED_PATH")))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-path ,(getenv "GI_TYPELIB_PATH")))
+ `("GIO_EXTRA_MODULES" ":" prefix (,(getenv "GIO_EXTRA_MODULES")))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
+ `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
#t))))))
- (native-search-paths
- (list (search-path-specification
- (variable "GI_TYPELIB_PATH")
- (separator ":")
- (files '("lib/girepository-1.0")))
- (search-path-specification
- (variable "NOMAD_WEB_EXTENSION_DIR")
- (separator ":")
- (files '("libexec/nomad")))))
(home-page "https://savannah.nongnu.org/projects/nomad/")
(synopsis "Extensible Web Browser in Guile Scheme")
(description "Nomad is a Emacs-like web browser that consists of a modular
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.
2020-09-04 14:40 ` [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 Mike Rosset
@ 2020-09-07 6:10 ` Mathieu Othacehe
2020-09-07 6:55 ` Mike Rosset
2020-09-07 7:58 ` Mike Rosset
0 siblings, 2 replies; 15+ messages in thread
From: Mathieu Othacehe @ 2020-09-07 6:10 UTC (permalink / raw)
To: Mike Rosset; +Cc: 43182
Hello Mike,
I pushed the two first ones, thanks.
> * gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha-100-g6a565d3.
For this one, you need to describe every change exhaustively, according
to the commit message convention. For instance:
[native-inputs]: Add "gettext".
[propagated-inputs]: Move "glib-networking" to ....
[inputs]: ... here.
and so on.
> + `("GI_TYPELIB_PATH" ":" prefix (,gi-path ,(getenv "GI_TYPELIB_PATH")))
> + `("GIO_EXTRA_MODULES" ":" prefix (,(getenv "GIO_EXTRA_MODULES")))
You can wrap a few lines here to stay under the 78 columns limit.
> + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
> + `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
If NOMAD_WEB_EXTENSION_DIR is wrapped, it is up to the user to set
it. Don't we want to keep it as a native-search-paths so that any
extension package to nomad is automatically added to this variable?
Thanks,
Mathieu
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.
2020-09-07 6:10 ` Mathieu Othacehe
@ 2020-09-07 6:55 ` Mike Rosset
2020-09-07 11:02 ` Ricardo Wurmus
2020-09-07 7:58 ` Mike Rosset
1 sibling, 1 reply; 15+ messages in thread
From: Mike Rosset @ 2020-09-07 6:55 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 43182
Mathieu Othacehe <othacehe@gnu.org> writes:
> Hello Mike,
>
> I pushed the two first ones, thanks.
>
>> * gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha-100-g6a565d3.
>
> For this one, you need to describe every change exhaustively, according
> to the commit message convention. For instance:
>
> [native-inputs]: Add "gettext".
> [propagated-inputs]: Move "glib-networking" to ....
> [inputs]: ... here.
>
> and so on.
I'll reword this commit message.
>> + `("GI_TYPELIB_PATH" ":" prefix (,gi-path ,(getenv "GI_TYPELIB_PATH")))
>> + `("GIO_EXTRA_MODULES" ":" prefix (,(getenv "GIO_EXTRA_MODULES")))
>
> You can wrap a few lines here to stay under the 78 columns limit.
>
>> + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
>> + `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
>
> If NOMAD_WEB_EXTENSION_DIR is wrapped, it is up to the user to set
> it. Don't we want to keep it as a native-search-paths so that any
> extension package to nomad is automatically added to this variable?
>
No, web extension is a GTK term for extending the WebKit process
which runs outside of the GTK/Glib process.
The extensions are dynamic libraries and you need to tell the
WebKitWebContext where to look for them. Normally I'd just substitute
in the $(libexecdir). But we need to use the libs in the build directory for
testing. And I can't use libtool --mode=execute -dlopen. Because the
WebKit process does the dlopen.
We don't actually do much with the WebProcess right now. But later it's
a pathway to DOM introspection using scheme... at least in theory.
So it's easier to just set NOMAD_WEB_EXTENSION_DIR in pre-inst-env. For
end users setting NOMAD_WEB_EXTENSION_DIR explicitly in a wrap will have
no impact. Since nomad extensions are done in scheme and use the normal
search path mechanisms for guile.
Mike
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.
2020-09-03 13:47 [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 Mike Rosset
2020-09-03 14:42 ` Mike Rosset
2020-09-04 14:40 ` [bug#43182] [PATCH 1/3] gnu: emacsy-minimal: Update to v0.4.1-31-g415d96f Mike Rosset
@ 2020-09-07 7:53 ` Mike Rosset
2020-09-07 8:58 ` bug#43182: " Mathieu Othacehe
2 siblings, 1 reply; 15+ messages in thread
From: Mike Rosset @ 2020-09-07 7:53 UTC (permalink / raw)
To: 43182; +Cc: Mike Rosset
* gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha-100-g6a565d3.
[source]: use permanent redirect for source url
[native-inputs]: Add gnu-gettext
[inputs]: Add gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad,
gst-plugins-ugly
[propagated-inputs]: Move to inputs gstreamer, gst-plugins-base, gst-plugins-good,
gst-plugins-bad, gst-plugins-ugly. Removed gsettings-desktop-scheme
[wrap]: Add GST_PLUGINS_PATH, NOMAD_WEB_EXTENSION_DIR, GI_TYPELIB_PATH
---
gnu/packages/guile-xyz.scm | 96 +++++++++++++++++---------------------
1 file changed, 42 insertions(+), 54 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index f88ebf2abf..25a3130e4f 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3108,16 +3108,16 @@ perform geometrical transforms on JPEG images.")
(define-public nomad
(package
(name "nomad")
- (version "0.2.0-alpha")
+ (version "0.2.0-alpha-100-g6a565d3")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://git.savannah.gnu.org/git/nomad.git")
+ (url "https://git.savannah.gnu.org/git/nomad.git/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "1z2z5x37v1qrk2vb8qlz2yj030iirzzd0maa9fjxzlqkrg6krbaj"))))
+ "0anmprm63a88kii251rl296v1g4iq62r6n4nssx5jbc0hzkknanz"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -3128,36 +3128,35 @@ perform geometrical transforms on JPEG images.")
("guile" ,guile-2.2)
("glib:bin" ,glib "bin")
("texinfo" ,texinfo)
+ ("gettext" ,gnu-gettext)
("perl" ,perl)))
(inputs
- `(("guile" ,guile-2.2)
+ `(;; Guile
+ ("guile" ,guile-2.2)
("guile-lib" ,guile2.2-lib)
("guile-readline" ,guile2.2-readline)
("guile-gcrypt" ,guile2.2-gcrypt)
("gnutls" ,gnutls)
+ ("g-golf" ,g-golf)
("shroud" ,shroud)
("emacsy" ,emacsy-minimal)
+ ;; Gtk
("glib" ,glib)
("dbus-glib" ,dbus-glib)
+ ("glib-networking" ,glib-networking)
("gtk+" ,gtk+)
("gtk+:bin" ,gtk+ "bin")
- ("gtksourceview" ,gtksourceview)
("webkitgtk" ,webkitgtk)
- ("g-golf" ,g-golf)
- ("xorg-server" ,xorg-server)))
- (propagated-inputs
- `(("glib" ,glib)
- ("glib-networking" ,glib-networking)
+ ("gtksourceview" ,gtksourceview)
+ ("vte" ,vte)
+ ;; Gstreamer
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gst-plugins-bad" ,gst-plugins-bad)
("gst-plugins-ugly" ,gst-plugins-ugly)
- ("gtk+" ,gtk+)
- ("gtksourceview" ,gtksourceview)
- ("vte" ,vte)
- ("webkitgtk" ,webkitgtk)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
+ ;; Util
+ ("xorg-server" ,xorg-server)))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
@@ -3175,49 +3174,38 @@ perform geometrical transforms on JPEG images.")
#t))
(add-after 'install 'wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (gio-deps (map (cut assoc-ref inputs <>)
- '("glib-networking"
- "glib"
- "gstreamer"
- "gst-plugins-base"
- "gst-plugins-good"
- "gst-plugins-bad"
- "gst-plugins-ugly")))
- (gio-mod-path (map (cut string-append <>
- "/lib/gio/modules")
- gio-deps))
- (effective (read-line (open-pipe*
+ (let* ((out (assoc-ref outputs "out"))
+ (effective (read-line (open-pipe*
OPEN_READ
"guile" "-c"
"(display (effective-version))")))
- (deps (map (cut assoc-ref inputs <>)
- '("emacsy" "guile-lib" "guile-readline"
- "g-golf" "shroud")))
- (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)))
- (progs (map (cut string-append out "/bin/" <>)
- '("nomad"))))
- (map (cut wrap-program <>
- `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-path)
- `("GUILE_LOAD_PATH" ":" prefix ,scm-path)
- `("GUILE_LOAD_COMPILED_PATH" ":"
- prefix ,go-path))
- progs)
+ (gst-plugins (map (lambda (i)
+ (string-append (assoc-ref inputs i)
+ "/lib/gstreamer-1.0"))
+ `("gstreamer"
+ "gst-plugins-base"
+ "gst-plugins-good"
+ "gst-plugins-bad"
+ "gst-plugins-ugly")))
+ (out-append (lambda (. args)
+ (apply string-append out args)))
+ (gi-path (out-append "/lib/girepository-1.0"))
+ (load-path (out-append "/share/guile/site/" effective))
+ (comp-path (out-append "/lib/guile/" effective "/site-ccache"))
+ (ext-path (out-append "/libexec/nomad")))
+ (wrap-program (string-append out "/bin/nomad")
+ `("GUILE_LOAD_PATH" ":" prefix (,load-path
+ ,(getenv "GUILE_LOAD_PATH")))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+ (,comp-path
+ ,(getenv "GUILE_LOAD_COMPILED_PATH")))
+ `("GI_TYPELIB_PATH" ":" prefix
+ (,gi-path ,(getenv "GI_TYPELIB_PATH")))
+ `("GIO_EXTRA_MODULES" ":" prefix
+ (,(getenv "GIO_EXTRA_MODULES")))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
+ `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
#t))))))
- (native-search-paths
- (list (search-path-specification
- (variable "GI_TYPELIB_PATH")
- (separator ":")
- (files '("lib/girepository-1.0")))
- (search-path-specification
- (variable "NOMAD_WEB_EXTENSION_DIR")
- (separator ":")
- (files '("libexec/nomad")))))
(home-page "https://savannah.nongnu.org/projects/nomad/")
(synopsis "Extensible Web Browser in Guile Scheme")
(description "Nomad is a Emacs-like web browser that consists of a modular
--
2.28.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.
2020-09-07 6:10 ` Mathieu Othacehe
2020-09-07 6:55 ` Mike Rosset
@ 2020-09-07 7:58 ` Mike Rosset
1 sibling, 0 replies; 15+ messages in thread
From: Mike Rosset @ 2020-09-07 7:58 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 43182
Mathieu Othacehe <othacehe@gnu.org> writes:
> Hello Mike,
>
> I pushed the two first ones, thanks.
>
>> * gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha-100-g6a565d3.
>
> For this one, you need to describe every change exhaustively, according
> to the commit message convention. For instance:
>
> [native-inputs]: Add "gettext".
> [propagated-inputs]: Move "glib-networking" to ....
> [inputs]: ... here.
>
> and so on.
Reworded commit following this format.
>> + `("GI_TYPELIB_PATH" ":" prefix (,gi-path ,(getenv "GI_TYPELIB_PATH")))
>> + `("GIO_EXTRA_MODULES" ":" prefix (,(getenv "GIO_EXTRA_MODULES")))
>
> You can wrap a few lines here to stay under the 78 columns limit.
>
>> + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
>> + `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
Wrapped these lines and emailed a new 001 patch for Nomad.
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#43182: [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.
2020-09-07 7:53 ` [bug#43182] [PATCH] " Mike Rosset
@ 2020-09-07 8:58 ` Mathieu Othacehe
2020-09-07 9:27 ` [bug#43182] " Mike Rosset
0 siblings, 1 reply; 15+ messages in thread
From: Mathieu Othacehe @ 2020-09-07 8:58 UTC (permalink / raw)
To: Mike Rosset; +Cc: 43182-done
> * gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha-100-g6a565d3.
Thanks for the new version :). I edited the commit message, fixed the
indentation and pushed.
I just noticed that our linter is reporting CVE for another software
called "nomad".
Mathieu
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.
2020-09-07 8:58 ` bug#43182: " Mathieu Othacehe
@ 2020-09-07 9:27 ` Mike Rosset
0 siblings, 0 replies; 15+ messages in thread
From: Mike Rosset @ 2020-09-07 9:27 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 43182-done
Mathieu Othacehe <othacehe@gnu.org> writes:
>> * gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha-100-g6a565d3.
>
> Thanks for the new version :). I edited the commit message, fixed the
> indentation and pushed.
I appreciate that Mathieu, I was in a little rush to get these three
packages to land close together. And I had many fixes for Nomad that I
wanted to make sure were in guix sooner then later. These two last
updates to Nomad have been a transition form C to scheme. Hopefully the
next submission will be less hectic. Again I appreciate the code review.
> I just noticed that our linter is reporting CVE for another software
> called "nomad".
>
> Mathieu
I noticed this as well, I hope there isn't a unix short name clash. I
could always go with nomad-browser if push comes to shove.
Mike
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.
2020-09-07 6:55 ` Mike Rosset
@ 2020-09-07 11:02 ` Ricardo Wurmus
2020-09-07 16:24 ` Mike Rosset
0 siblings, 1 reply; 15+ messages in thread
From: Ricardo Wurmus @ 2020-09-07 11:02 UTC (permalink / raw)
To: Mike Rosset; +Cc: othacehe, 43182
Mike Rosset <mike.rosset@gmail.com> writes:
>>> + `("GI_TYPELIB_PATH" ":" prefix (,gi-path ,(getenv "GI_TYPELIB_PATH")))
>>> + `("GIO_EXTRA_MODULES" ":" prefix (,(getenv "GIO_EXTRA_MODULES")))
>>
>> You can wrap a few lines here to stay under the 78 columns limit.
>>
>>> + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
>>> + `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
>>
>> If NOMAD_WEB_EXTENSION_DIR is wrapped, it is up to the user to set
>> it. Don't we want to keep it as a native-search-paths so that any
>> extension package to nomad is automatically added to this variable?
>>
>
> No, web extension is a GTK term for extending the WebKit process
> which runs outside of the GTK/Glib process.
>
> The extensions are dynamic libraries and you need to tell the
> WebKitWebContext where to look for them. Normally I'd just substitute
> in the $(libexecdir). But we need to use the libs in the build directory for
> testing. And I can't use libtool --mode=execute -dlopen. Because the
> WebKit process does the dlopen.
During the build you could use LD_LIBRARY_PATH, no?
--
Ricardo
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.
2020-09-07 11:02 ` Ricardo Wurmus
@ 2020-09-07 16:24 ` Mike Rosset
0 siblings, 0 replies; 15+ messages in thread
From: Mike Rosset @ 2020-09-07 16:24 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: othacehe, 43182
Ricardo Wurmus <rekado@elephly.net> writes:
> Mike Rosset <mike.rosset@gmail.com> writes:
>
>>
>> No, web extension is a GTK term for extending the WebKit process
>> which runs outside of the GTK/Glib process.
>>
>> The extensions are dynamic libraries and you need to tell the
>> WebKitWebContext where to look for them. Normally I'd just substitute
>> in the $(libexecdir). But we need to use the libs in the build directory for
>> testing. And I can't use libtool --mode=execute -dlopen. Because the
>> WebKit process does the dlopen.
>
> During the build you could use LD_LIBRARY_PATH, no?
No, The WebKitWebContext only uses the directory that is set by
webkit_web_context_set_web_extensions_directory. See
https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebContext.html#webkit-web-context-set-web-extensions-directory.
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-09-07 16:25 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-03 13:47 [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 Mike Rosset
2020-09-03 14:42 ` Mike Rosset
2020-09-03 14:48 ` Mike Rosset
2020-09-04 6:17 ` Mathieu Othacehe
2020-09-04 14:40 ` [bug#43182] [PATCH 1/3] gnu: emacsy-minimal: Update to v0.4.1-31-g415d96f Mike Rosset
2020-09-04 14:40 ` [bug#43182] [PATCH 2/3] gnu: g-golf: Update to git hash 84e894e Mike Rosset
2020-09-04 14:40 ` [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 Mike Rosset
2020-09-07 6:10 ` Mathieu Othacehe
2020-09-07 6:55 ` Mike Rosset
2020-09-07 11:02 ` Ricardo Wurmus
2020-09-07 16:24 ` Mike Rosset
2020-09-07 7:58 ` Mike Rosset
2020-09-07 7:53 ` [bug#43182] [PATCH] " Mike Rosset
2020-09-07 8:58 ` bug#43182: " Mathieu Othacehe
2020-09-07 9:27 ` [bug#43182] " Mike Rosset
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).