From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8DkEDvg1IF+YBgAA0tVLHw (envelope-from ) for ; Tue, 28 Jul 2020 14:28:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +Oz3Cfg1IF9BagAAB5/wlQ (envelope-from ) for ; Tue, 28 Jul 2020 14:28:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9AC21940391 for ; Tue, 28 Jul 2020 14:28:07 +0000 (UTC) Received: from localhost ([::1]:58712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0QaM-0008Hj-2L for larch@yhetil.org; Tue, 28 Jul 2020 10:28:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0QaI-0008HW-Ne for guix-patches@gnu.org; Tue, 28 Jul 2020 10:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47209) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0QaI-0001Eh-FO for guix-patches@gnu.org; Tue, 28 Jul 2020 10:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0QaI-0001zN-Be for guix-patches@gnu.org; Tue, 28 Jul 2020 10:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42582] [PATCH] gnu: nomad: Update to 0.2.0-alpha. Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Jul 2020 14:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42582@debbugs.gnu.org Cc: Mike Rosset X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15959464687624 (code B ref -1); Tue, 28 Jul 2020 14:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jul 2020 14:27:48 +0000 Received: from localhost ([127.0.0.1]:58755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0QZp-0001yf-DY for submit@debbugs.gnu.org; Tue, 28 Jul 2020 10:27:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:32946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0QZn-0001yX-9C for submit@debbugs.gnu.org; Tue, 28 Jul 2020 10:27:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0QZn-0008E0-2N for guix-patches@gnu.org; Tue, 28 Jul 2020 10:27:31 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:55877) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0QZl-00019A-0V for guix-patches@gnu.org; Tue, 28 Jul 2020 10:27:30 -0400 Received: by mail-pj1-x1031.google.com with SMTP id k1so11672025pjt.5 for ; Tue, 28 Jul 2020 07:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MQmusLcgdj2qT5pRZt09l8KwlcxAypoeZIt7YnLvWY0=; b=sb445gcrjRQJrcjx5B1uRaPiPJgACFFIf1hYtmn9iZHiMrrdcrVKo7Ydbd/Fo/U291 C4A+ID+Ct1YRXRwcITjIfHKzNHyuQUOycdd8Z9m+9L1Er7ogQ6CoC5GoWLWOz5NdL3qF 2ttaEc3Uy4Cibux6z4LosAvBqmbZyYdnci3ifQzoU+k121UEDSslMJsSmmhZpfJT5JN3 KqDqg3Mh9HDUgk3daX93cJGf7kUteLdAnE+GM2yhdEiw5cT9eGu8eZLIDoCvqtocye77 xuMXSsidJHQO3yJuB772I4+0AITMsHcIOEQOrPQKgd5pJ/qvv51A46kxrUk3OQMsVqWz 6qJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MQmusLcgdj2qT5pRZt09l8KwlcxAypoeZIt7YnLvWY0=; b=fuqUzwLm3fTXtW/IhKpVZfkY6lEAHihb7fOu6tLPwxl1XY5KjbKX2N+CgMCbIzZvPU JnsWM0sdPGRb+R+DM1myUh/QPjBZ/NozsfRBFhO8F7OY6iaanP75WBXFj6gNBt22nHLd t65xM3uVs8aqlb+k3uZoO6W/6HDeEmvDFN/kvDHiLdwKubcJ6800FVBAcVtZMuXQssXo oaKWMYU1q6QoHABfQNBorl9fRphM+g+PJUD4WBwla9dQwDINmxdeOIkHsox0jYdHCiP0 T3vlo+/9Nn6dA+G/hdcB/1BMKtR8hfhIfLgTk4NLZ+oj6F9f25jazQfpDyX19+blH920 qnrw== X-Gm-Message-State: AOAM531MXsShCc5Q8dAf4iNNDBI7vN9dAuOMmYDs4hqJLj3nQKN40D8I p+bllyosqGVdbkXxG91nwa4uGQSP X-Google-Smtp-Source: ABdhPJw3RfnaR1txQJ2QGrPkKMwSB6QmWRgiXh5bEf2RsA6mtwYHyYM2LqFuelJ3UnCvP6pDYSbiZQ== X-Received: by 2002:a17:90a:1a02:: with SMTP id 2mr4553874pjk.150.1595946446746; Tue, 28 Jul 2020 07:27:26 -0700 (PDT) Received: from neutron.hitronhub.home (S010664777da04f43.vf.shawcable.net. [70.68.94.152]) by smtp.gmail.com with ESMTPSA id a24sm895406pfg.113.2020.07.28.07.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2020 07:27:25 -0700 (PDT) From: Mike Rosset Date: Tue, 28 Jul 2020 07:27:22 -0700 Message-Id: <20200728142722.408593-1-mike.rosset@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=mike.rosset@gmail.com; helo=mail-pj1-x1031.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=sb445gcr; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: WkZTaF6J0QU+ * 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. --- gnu/packages/guile-xyz.scm | 210 ++++++++++++++++++++----------------- 1 file changed, 115 insertions(+), 95 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5f7a93b8c6..1cf2327de6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages hurd) @@ -2952,101 +2953,120 @@ perform geometrical transforms on JPEG images.") (license license:gpl3+)))) (define-public nomad - (package - (name "nomad") - (version "0.1.2-alpha") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/nomad.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dnkr1hmvfkwgxd75dcf93pg39yfgawvdpzdhv991yhghv0qxc9h")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("bash" ,bash) - ("pkg-config" ,pkg-config) - ("libtool" ,libtool) - ("guile" ,guile-2.2) - ("glib:bin" ,glib "bin") - ("texinfo" ,texinfo) - ("perl" ,perl))) - (inputs - `(("guile" ,guile-2.2) - ("guile-lib" ,guile2.2-lib) - ("guile-gcrypt" ,guile2.2-gcrypt) - ("guile-readline" ,guile2.2-readline) - ("gnutls" ,gnutls) - ("shroud" ,shroud) - ("emacsy" ,emacsy-minimal) - ("glib" ,glib) - ("dbus-glib" ,dbus-glib) - ("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview) - ("webkitgtk" ,webkitgtk) - ("xorg-server" ,xorg-server))) - (propagated-inputs - `(("glib" ,glib) - ("glib-networking" ,glib-networking) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 popen) - (ice-9 rdelim) - (srfi srfi-26)) - #:configure-flags - ;; Ignore ‘error: ‘GTimeVal’ is deprecated: Use 'GDateTime' instead.’ - (list "CFLAGS=-Wno-error") - #:phases - (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (format #f "~a/bin/Xvfb :1 &" - (assoc-ref inputs "xorg-server"))) - (setenv "DISPLAY" ":1") - #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"))) - (gio-mod-path (map (cut string-append <> "/lib/gio/modules") - gio-deps)) - (effective (read-line (open-pipe* - OPEN_READ - "guile" "-c" - "(display (effective-version))"))) - (deps (map (cut assoc-ref inputs <>) - '("emacsy" "guile-lib" "guile-readline" - "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) - #t)))))) - (home-page "https://savannah.nongnu.org/projects/nomad/") - (synopsis "Extensible Web Browser in Guile Scheme") - (description "Nomad is an Emacs-like Web Browser built using Webkitgtk and -Emacsy. It has a small C layer and most browser features are fully -programmable in Guile. It has hooks, keymaps, and self documentation -features.") - (license license:gpl3+))) + (let ((commit "0.2.0-alpha") + (hash (base32 "1z2z5x37v1qrk2vb8qlz2yj030iirzzd0maa9fjxzlqkrg6krbaj"))) + (package + (name "nomad") + (version commit) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/nomad.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 hash))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("bash" ,bash) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("guile" ,guile-2.2) + ("glib:bin" ,glib "bin") + ("texinfo" ,texinfo) + ("perl" ,perl))) + (inputs + `(("guile" ,guile-2.2) + ("guile-lib" ,guile2.2-lib) + ("guile-readline" ,guile2.2-readline) + ("guile-gcrypt" ,guile2.2-gcrypt) + ("gnutls" ,gnutls) + ("shroud" ,shroud) + ("emacsy" ,emacsy-minimal) + ("glib" ,glib) + ("dbus-glib" ,dbus-glib) + ("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) + ("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))) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (format #f "~a/bin/Xvfb :1 &" + (assoc-ref inputs "xorg-server"))) + (setenv "DISPLAY" ":1") + #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* + 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) + #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 feature-set fully programmable in Guile Scheme.") + (license license:gpl3+)))) (define-public guile-cv (package -- 2.27.0