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 sMhRJhkDUV8OXAAA0tVLHw (envelope-from ) for ; Thu, 03 Sep 2020 14:52:09 +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 wJkkIhkDUV/hDgAAB5/wlQ (envelope-from ) for ; Thu, 03 Sep 2020 14:52:09 +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 EFC999406BD for ; Thu, 3 Sep 2020 14:52:08 +0000 (UTC) Received: from localhost ([::1]:38154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDqat-0002Aq-Tj for larch@yhetil.org; Thu, 03 Sep 2020 10:52:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDqXv-0001D0-5B for guix-patches@gnu.org; Thu, 03 Sep 2020 10:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDqXu-0002Is-SE for guix-patches@gnu.org; Thu, 03 Sep 2020 10:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDqXu-0001PY-QV for guix-patches@gnu.org; Thu, 03 Sep 2020 10:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Sep 2020 14:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43182@debbugs.gnu.org Cc: Mike Rosset Received: via spool by 43182-submit@debbugs.gnu.org id=B43182.15991445255391 (code B ref 43182); Thu, 03 Sep 2020 14:49:02 +0000 Received: (at 43182) by debbugs.gnu.org; 3 Sep 2020 14:48:45 +0000 Received: from localhost ([127.0.0.1]:35916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDqXd-0001Ot-0S for submit@debbugs.gnu.org; Thu, 03 Sep 2020 10:48:45 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:39467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDqXa-0001Oe-Jl for 43182@debbugs.gnu.org; Thu, 03 Sep 2020 10:48:43 -0400 Received: by mail-pf1-f196.google.com with SMTP id u128so2515998pfb.6 for <43182@debbugs.gnu.org>; Thu, 03 Sep 2020 07:48:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=i6NaU2aA63fkClMmrrQJKBJXnLe3ALf6BujIt/+eTcQ=; b=CgZ0Ih0Q8fw2W8p4ZZpm5kHHfRUquu2spvf72kCGqFxsLl9ltX7xLxQE8cq//PVAsv m2zEaqAJ/G0SxSggYXDMTXi8gHYv3fjj/2wX0QqiWq7LRYGoZDmgTYRJ0VhPrKLe6BRH q33Yf2AZN3MXKUbqiyxJzbXLTo3nuyj5wIlmyIaW1wEHO2EpxNRXNTKNCpL+J53VokNC +yTwYA8aorLRBF79bb/Blgu+LI/EmL7agT5CE5mr0Tum889onU4UbSfDBlys0AWQlLjO r4uLFV5zsgeKV6uP9vgIA0bqzNeJ3Kaltl3Zyn30ysqAzFE5q3MIcct6LPD5y+m4MYED hhGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=i6NaU2aA63fkClMmrrQJKBJXnLe3ALf6BujIt/+eTcQ=; b=WIqtxZBFrd7EvgWyqn0TQ7HrgKEK3hgv7EsmGmXw8llSSCA9nJvcIaho80r4kKvDq+ OpC6vtA9ABZk4MHfO660axGjeJopJsCbTBodUTc3THC6Aen58E5BeGjPyXWeAW05GbPr mr9JnuapdOThr1kokX98TpO4P5HMJjSVMQ4wK+RDOeuT7YnsjS4veXpPkti+VfQMHSfi KCaDlr6BKzBBMfrmmMAOhn/W3e/UwkHB7XSFLODe0gMUwgaFQDl3G/oRFu6S30fGLUL/ SmCkzjrySMSdOBri/p2TCkM8mPm5CArWPB+s8ULe5UDFNqwBhPaEEmbDMdcFZyOYX2H/ aX/g== X-Gm-Message-State: AOAM533Oq3sh0XsAfPyuoatAB/qSKNgPz9ClusiLF8vBvNZBrc9duq8o B631+9eMFO5M29PYu/vTJM8= X-Google-Smtp-Source: ABdhPJwL//fBH3MStGZXU5QYOPLV/NTZdxRqR5eB/sNDWxqdKbI7E7hJf5iH4xWd7OeLQa+d+xX0CQ== X-Received: by 2002:a62:1796:: with SMTP id 144mr3999248pfx.200.1599144516432; Thu, 03 Sep 2020 07:48:36 -0700 (PDT) Received: from neutron (S010664777da04f43.vf.shawcable.net. [70.68.94.152]) by smtp.gmail.com with ESMTPSA id lk16sm2497426pjb.13.2020.09.03.07.48.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 07:48:35 -0700 (PDT) References: <20200903144232.332876-1-mike.rosset@gmail.com> User-agent: mu4e 1.4.13; emacs 27.1 From: Mike Rosset In-reply-to: <20200903144232.332876-1-mike.rosset@gmail.com> Date: Thu, 03 Sep 2020 07:48:34 -0700 Message-ID: <87363y9arh.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain 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=CgZ0Ih0Q; 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: 2BiwGA0n2ten Mike Rosset 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