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 mI8GDj0BUV/2VAAA0tVLHw (envelope-from ) for ; Thu, 03 Sep 2020 14:44:13 +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 uFLNCT0BUV89CwAAB5/wlQ (envelope-from ) for ; Thu, 03 Sep 2020 14:44:13 +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 76AE094036A for ; Thu, 3 Sep 2020 14:44:12 +0000 (UTC) Received: from localhost ([::1]:55564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDqTB-0005nt-0J for larch@yhetil.org; Thu, 03 Sep 2020 10:44:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDqT4-0005n3-Ey for guix-patches@gnu.org; Thu, 03 Sep 2020 10:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDqT4-0001Ul-5R for guix-patches@gnu.org; Thu, 03 Sep 2020 10:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kDqT4-0001HW-3F for guix-patches@gnu.org; Thu, 03 Sep 2020 10:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43182] [PATCH] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3 References: <20200903134701.313784-1-mike.rosset@gmail.com> In-Reply-To: <20200903134701.313784-1-mike.rosset@gmail.com> Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Sep 2020 14:44: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.15991441974868 (code B ref 43182); Thu, 03 Sep 2020 14:44:02 +0000 Received: (at 43182) by debbugs.gnu.org; 3 Sep 2020 14:43:17 +0000 Received: from localhost ([127.0.0.1]:35897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDqSL-0001GR-0O for submit@debbugs.gnu.org; Thu, 03 Sep 2020 10:43:17 -0400 Received: from mail-pf1-f175.google.com ([209.85.210.175]:33055) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDqSJ-0001GE-4B for 43182@debbugs.gnu.org; Thu, 03 Sep 2020 10:43:15 -0400 Received: by mail-pf1-f175.google.com with SMTP id u20so2528757pfn.0 for <43182@debbugs.gnu.org>; Thu, 03 Sep 2020 07:43:15 -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=RNYNq1l72CpYO960uS1pHL7zD8QOjGWfzLbx2TbUzpE=; b=Me+MI/UF9BC38KdJDopbmqCpI/r00Z7ajOKF+kB+T28hBDzuHHcjOtT2Qdq6PUF+ut 3l0fBIX7nbP/LQY1VA6sGJVjLenRPihiZwVWtCU9cxL18uwpDA/7vJWoFxFQjrwnVM5i JGUQVUWKE/yTe5+hMbEkehGoubd5LpVSQxYXqs8x281Nn7JVCydJXQxaPjWKSZczwqXb QD0lFuUVSDp/wXWAtkIIks5A9fSuHRszul2A3C/cncckRGkvt/Fu+7Pu0Ep/jjtNu3FP 2YVMvnB75+OUkhSRWhBq/bz/KZ2i3sfg6TF0h/aVO67Jo9GciYgQKsS5JYfDZHRJUaSO PsHw== 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=RNYNq1l72CpYO960uS1pHL7zD8QOjGWfzLbx2TbUzpE=; b=gF34oGrueo2I3Smc482xRYIbjT/TqSGN7g40RSPzi1vV0Z8mxDeu5slBb81qXLDVGV mFjCLh64AtsD7rk8iDO0ECuL38OL8zNW0HbKoiD2HGnCe1IJsAh4zoU7nekCzYCyPw/F w1a3XstVnMq9waIvThvo/B35QhwabDKcZbFU8yrKDknt38ekQf5PsF6WqU90kqvPM3Mi 3b0cm14+jNryoFEzCKwAwx81H6yaaNeqcu3RQ8xxOvlGIp3Jjdo0feFWhMvVloNWMCZP IOKScEAPPY13Smj0TRB6Dp9E6q5GslnjXScQ9iMPU3Ko0unDMGpz8/5cPOxyxv8Pl6Cp t5Tw== X-Gm-Message-State: AOAM531Hrms49vwaKXHhhd04QwXxLZidewWdGgeefQ/jNhtqBizAwO4J LzLRfHS/Z8QhJAlUw7le3f8LQaVdXoI= X-Google-Smtp-Source: ABdhPJw5RlRtYoX7UW8fe03K3aWOdN68Fs5vRHRzK66WNOwGySc8VyV/tg4SE/79fT7UhLEgLFBLDQ== X-Received: by 2002:a62:5cc3:0:b029:137:3e38:c5e0 with SMTP id q186-20020a625cc30000b02901373e38c5e0mr2522570pfb.2.1599144188530; Thu, 03 Sep 2020 07:43:08 -0700 (PDT) Received: from neutron.hitronhub.home (S010664777da04f43.vf.shawcable.net. [70.68.94.152]) by smtp.gmail.com with ESMTPSA id b18sm2904547pgk.36.2020.09.03.07.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 07:43:07 -0700 (PDT) From: Mike Rosset Date: Thu, 3 Sep 2020 07:42:33 -0700 Message-Id: <20200903144232.332876-1-mike.rosset@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=Me+MI/UF; 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: 4.09 X-TUID: Ae6HtGc4Grxj * 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