me
/
guix
Archived
1
0
Fork 0
Code

gnu: nomad: Update to 0.2.0-alpha. 

* gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha.

This is a significant update to Nomad. This removes the majority of C code and
replaces it with gobject introspection using g-golf.

In the process the nomad package expression has changed significantly.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
master
Mike Rosset 2020-07-28 07:27:22 -07:00 committed by Mathieu Othacehe
parent dcb74405e1
commit a987f128b5
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gnu/packages/guile-xyz.scm
View File

@ -30,6 +30,7 @@
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Masaya Tojo <masaya@tojo.tokyo> ;;; Copyright © 2020 Masaya Tojo <masaya@tojo.tokyo>
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357@gmail.com> ;;; Copyright © 2020 Jesse Gibbons <jgibbons2357@gmail.com>
;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -66,6 +67,7 @@
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
@ -2954,7 +2956,7 @@ perform geometrical transforms on JPEG images.")
(define-public nomad (define-public nomad
(package (package
(name "nomad") (name "nomad")
(version "0.1.2-alpha") (version "0.2.0-alpha")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2963,7 +2965,7 @@ perform geometrical transforms on JPEG images.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1dnkr1hmvfkwgxd75dcf93pg39yfgawvdpzdhv991yhghv0qxc9h")))) "1z2z5x37v1qrk2vb8qlz2yj030iirzzd0maa9fjxzlqkrg6krbaj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -2978,20 +2980,31 @@ perform geometrical transforms on JPEG images.")
(inputs (inputs
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)
("guile-lib" ,guile2.2-lib) ("guile-lib" ,guile2.2-lib)
("guile-gcrypt" ,guile2.2-gcrypt)
("guile-readline" ,guile2.2-readline) ("guile-readline" ,guile2.2-readline)
("guile-gcrypt" ,guile2.2-gcrypt)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("shroud" ,shroud) ("shroud" ,shroud)
("emacsy" ,emacsy-minimal) ("emacsy" ,emacsy-minimal)
("glib" ,glib) ("glib" ,glib)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("gtk+:bin" ,gtk+ "bin")
("gtksourceview" ,gtksourceview) ("gtksourceview" ,gtksourceview)
("webkitgtk" ,webkitgtk) ("webkitgtk" ,webkitgtk)
("g-golf" ,g-golf)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(propagated-inputs (propagated-inputs
`(("glib" ,glib) `(("glib" ,glib)
("glib-networking" ,glib-networking) ("glib-networking" ,glib-networking)
("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))) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -2999,9 +3012,6 @@ perform geometrical transforms on JPEG images.")
(ice-9 popen) (ice-9 popen)
(ice-9 rdelim) (ice-9 rdelim)
(srfi srfi-26)) (srfi srfi-26))
#:configure-flags
;; Ignore ‘error: ‘GTimeVal’ is deprecated: Use 'GDateTime' instead.’
(list "CFLAGS=-Wno-error")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'start-xorg-server (add-before 'check 'start-xorg-server
@ -3014,9 +3024,16 @@ perform geometrical transforms on JPEG images.")
(add-after 'install 'wrap-binaries (add-after 'install 'wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(gio-deps (map (cut assoc-ref inputs <>) '("glib-networking" (gio-deps (map (cut assoc-ref inputs <>)
"glib"))) '("glib-networking"
(gio-mod-path (map (cut string-append <> "/lib/gio/modules") "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)) gio-deps))
(effective (read-line (open-pipe* (effective (read-line (open-pipe*
OPEN_READ OPEN_READ
@ -3024,7 +3041,7 @@ perform geometrical transforms on JPEG images.")
"(display (effective-version))"))) "(display (effective-version))")))
(deps (map (cut assoc-ref inputs <>) (deps (map (cut assoc-ref inputs <>)
'("emacsy" "guile-lib" "guile-readline" '("emacsy" "guile-lib" "guile-readline"
"shroud"))) "g-golf" "shroud")))
(scm-path (map (cut string-append <> (scm-path (map (cut string-append <>
"/share/guile/site/" effective) "/share/guile/site/" effective)
`(,out ,@deps))) `(,out ,@deps)))
@ -3040,12 +3057,19 @@ perform geometrical transforms on JPEG images.")
prefix ,go-path)) prefix ,go-path))
progs) progs)
#t)))))) #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/") (home-page "https://savannah.nongnu.org/projects/nomad/")
(synopsis "Extensible Web Browser in Guile Scheme") (synopsis "Extensible Web Browser in Guile Scheme")
(description "Nomad is an Emacs-like Web Browser built using Webkitgtk and (description "Nomad is a Emacs-like web browser that consists of a modular
Emacsy. It has a small C layer and most browser features are fully feature-set, fully programmable in Guile Scheme.")
programmable in Guile. It has hooks, keymaps, and self documentation
features.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public guile-cv (define-public guile-cv