From patchwork Fri Sep 4 14:40:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 23892 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 780AB27BBE9; Fri, 4 Sep 2020 15:42:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E64AC27BBE8 for ; Fri, 4 Sep 2020 15:42:16 +0100 (BST) Received: from localhost ([::1]:38132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kECuu-0006In-4T for patchwork@mira.cbaines.net; Fri, 04 Sep 2020 10:42:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kECug-0006G3-3T for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kECuf-0005VI-Ot for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kECuf-00064L-N9 for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43182] [PATCH 1/3] gnu: emacsy-minimal: Update to v0.4.1-31-g415d96f. 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: Fri, 04 Sep 2020 14:42:01 +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.159923047923257 (code B ref 43182); Fri, 04 Sep 2020 14:42:01 +0000 Received: (at 43182) by debbugs.gnu.org; 4 Sep 2020 14:41:19 +0000 Received: from localhost ([127.0.0.1]:40299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kECty-000632-6t for submit@debbugs.gnu.org; Fri, 04 Sep 2020 10:41:19 -0400 Received: from mail-pl1-f172.google.com ([209.85.214.172]:36511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kECtv-00062m-J4 for 43182@debbugs.gnu.org; Fri, 04 Sep 2020 10:41:16 -0400 Received: by mail-pl1-f172.google.com with SMTP id y6so1262689plt.3 for <43182@debbugs.gnu.org>; Fri, 04 Sep 2020 07:41: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=xmrOtlcS326YJFP3BwmSLB81xQSKNvkoovoCtc9TlPQ=; b=HLntSSg2O4bhjq4vuV5JivKS+Bhrt9I7MQjGXUP1Yi8q3EOoWZOTuZfGvz+uXMka08 eBl6rwj5qzsM3kacEuNUos9KY1Y+E2pxmXyiENCmqJQb6bdp6Rt1VVb6c9O40cQHtwHi 9yfjQbioKUcwAFVqpAL1fCzwMVSGmxbJBejvHXF7yj/xDJ5/eklK79yGQ/uiHsOMwMhL MTiysc7v1H87o07vCMLbTgcCi+2zrKJam/uCJ3hojWVNi4nRZMmBIhraea6hg4w3zqWg XKuxByJBKc5v83lplYofKe+z+qLwSMTt0VkeDTnNzLbdW43KO7ctBnGNFWR1GmiFjUWK 1P2g== 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=xmrOtlcS326YJFP3BwmSLB81xQSKNvkoovoCtc9TlPQ=; b=YXq0Bx/GBAfu7DqaGxfpGGSXMy9vDIAtjAF7H1jjXNCy1e5tajzr/nRdVdQ28eBg3p 4ZymRrlsWUn5XhJM+vXZ7AZl9SIfzvPDUKxu7opAOeFJCQFfmeAHuekicbfTM9aj+xci uQ+hyX+JT3lPezirGOVUkCkBuzCX22BdOvDfkeK4JGBaaBEPEm33tEKnjW8XO792OlV3 lS3EjHBhFjXaiYCMGYYaHLdc8XfjGUBlLRK8aVtColS1dA4zC0JDME6M5AZikW6ciq1X 33RO8xWdAVfMsLC/bgMrAc3s1TyvTfCVecS+fmHiluF4dAVPP2BY3pO1hqrDQPnglg/a +exw== X-Gm-Message-State: AOAM530+/x3vfo8y7jVErEGvM+64hHfmsi+CSw/i2rDTRVHVNoHF+g9z xXhZ/X8frHH/puRV+YpiPLb2fPFgMds= X-Google-Smtp-Source: ABdhPJydpg0NeftMJQ3gBKv0Yx/3AdVtYsUjRwYJkggH0C5YFusZsFwiyH5lMchVFC3qphI5EtCmCA== X-Received: by 2002:a17:90a:cd06:: with SMTP id d6mr8117771pju.202.1599230469208; Fri, 04 Sep 2020 07:41:09 -0700 (PDT) Received: from neutron.hitronhub.home (S010664777da04f43.vf.shawcable.net. [70.68.94.152]) by smtp.gmail.com with ESMTPSA id g129sm6972872pfb.33.2020.09.04.07.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 07:41:08 -0700 (PDT) From: Mike Rosset Date: Fri, 4 Sep 2020 07:40:51 -0700 Message-Id: <20200904144053.1981499-1-mike.rosset@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Fri Sep 4 14:40:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 23894 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B7FEC27BBE8; Fri, 4 Sep 2020 15:42:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 81FC527BBE7 for ; Fri, 4 Sep 2020 15:42:32 +0100 (BST) Received: from localhost ([::1]:38986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kECv9-0006fQ-D9 for patchwork@mira.cbaines.net; Fri, 04 Sep 2020 10:42:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kECug-0006GY-EI for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kECug-0005VM-5C for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kECug-00064T-3d for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43182] [PATCH 2/3] gnu: g-golf: Update to git hash 84e894e. Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Sep 2020 14:42: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.159923049523291 (code B ref 43182); Fri, 04 Sep 2020 14:42:02 +0000 Received: (at 43182) by debbugs.gnu.org; 4 Sep 2020 14:41:35 +0000 Received: from localhost ([127.0.0.1]:40302 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kECu1-00063H-4R for submit@debbugs.gnu.org; Fri, 04 Sep 2020 10:41:35 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:34314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kECtz-00062r-Sc for 43182@debbugs.gnu.org; Fri, 04 Sep 2020 10:41:20 -0400 Received: by mail-pl1-f195.google.com with SMTP id s10so1265384plp.1 for <43182@debbugs.gnu.org>; Fri, 04 Sep 2020 07:41:19 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uab9k8BRYky9Ybx0pn5G/ksFOPJkd4+doi2cfvHHwjs=; b=sbz7XQuLFO0TsnpfsjbJoBvo1WUYjuJPYkgoEKNM8RVcg4+bIx4BeScuJlSX25eAR8 s39TXt2hUj5K4w2+l5Lcn2pItuEAh9NoULBO5Ql20KSDDUGlw/c8ymg0hzqg+0uxAuDd cvY+ZgsYTK+ycffBL24kRRKTuS/7IqAVEJ83OQm6S5yBzXli8hxQgBmDu1P41p3EdkNc uHQgqYX5wwJfHhwPRxx4+KGDKWlKqw/w5Jpqj050K1b2rWAKuJDxdkBWR4KEDiGjVF5o Asw+5PYWDcj3kBAmxHmGkInLiPgNua7SL6zNouCyapX5wQPCJqSdCA016Xk8hHFNejlt YIbg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Uab9k8BRYky9Ybx0pn5G/ksFOPJkd4+doi2cfvHHwjs=; b=AvT+iCCG/VuBrVzuo868IqEy/7LiMvc7VhFv7ZDnlSs7y/P3PBUhK+V0JIzow7MJiP urh4F5UbtOitaYqBDtTW9Zxszu0A749okbDuGIJTSvuydccZ5sW/yE6lphtbzgqTmAZl PErK2W94sbMEt0YanUI+JGPXXobzCA3HsMSKcwDUzZ5jI7ry3pOFruDKV08bcShPRRF6 6CX7Bdf5NMv5uQt6zU5VDcsTShEuT/At7ciIdlF0uE8yVs06vKYDIdiF6D2PDsETS1mp I1U4vTcbRNHi48kb60/5umUvBLGg5t9MYvHirDtoIuRibR3Tslx+EmwJjV8UU5Zm5XF0 P79g== X-Gm-Message-State: AOAM532l+N+WBc9JlwknG4ag+hwHOKt/TzsuQdCG5tgPCRCiJUiDwg4P QQcxeD2SupXci8y4iBQqMBCKJX933rE= X-Google-Smtp-Source: ABdhPJwB1nMA5dqJ2HDwoDhzqXmSsbUQFrfGTf/SPhX00gvCsBd5L/i8LCF6YXC5HujLene7jxg6aw== X-Received: by 2002:a17:90a:e44b:: with SMTP id jp11mr8239056pjb.96.1599230473826; Fri, 04 Sep 2020 07:41:13 -0700 (PDT) Received: from neutron.hitronhub.home (S010664777da04f43.vf.shawcable.net. [70.68.94.152]) by smtp.gmail.com with ESMTPSA id g129sm6972872pfb.33.2020.09.04.07.41.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 07:41:13 -0700 (PDT) From: Mike Rosset Date: Fri, 4 Sep 2020 07:40:52 -0700 Message-Id: <20200904144053.1981499-2-mike.rosset@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200904144053.1981499-1-mike.rosset@gmail.com> References: <20200904144053.1981499-1-mike.rosset@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Fri Sep 4 14:40:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 23893 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8CE227BBE8; Fri, 4 Sep 2020 15:42:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AB34627BBE7 for ; Fri, 4 Sep 2020 15:42:16 +0100 (BST) Received: from localhost ([::1]:38118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kECut-0006I8-Ri for patchwork@mira.cbaines.net; Fri, 04 Sep 2020 10:42:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kECug-0006H5-Qp for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kECug-0005VQ-ID for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kECug-00064a-GZ for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43182] [PATCH 3/3] 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: Fri, 04 Sep 2020 14:42: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.159923049623297 (code B ref 43182); Fri, 04 Sep 2020 14:42:02 +0000 Received: (at 43182) by debbugs.gnu.org; 4 Sep 2020 14:41:36 +0000 Received: from localhost ([127.0.0.1]:40305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kECuF-00063c-Na for submit@debbugs.gnu.org; Fri, 04 Sep 2020 10:41:36 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:41203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kECu2-000631-Rl for 43182@debbugs.gnu.org; Fri, 04 Sep 2020 10:41:23 -0400 Received: by mail-pl1-f196.google.com with SMTP id m15so145173pls.8 for <43182@debbugs.gnu.org>; Fri, 04 Sep 2020 07:41:22 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=+CroxZSGgFBJaJviyJ2+tFo8WZampxec0P7KHE/s48A=; b=Wb4lpnNXnyInH3Bt6EsWvKnb+PEXhDweMeZ7TmoH+vS/LhCkRHI4QQRrSpijczW8tq 9Y448SsdNIt8tMbJ+f80xZv+jFmv5Hbhs0z2X1aVQFHrfNam/zybwbwnZeQxHxrJ0/Ov FHzPDmRJb2MCX8IG/TV/LLxJOtXjdEsYVgKl72FmCV0hzY8KG+FdaPEGgj4xDAtskC9r klN85Z5aWSDad4SeVzLE5Id4XSghi2yp5UsoC4H6d42T38o0rhWj0HYeaksvC9+gtPK/ DKtBNGFBldshn4jdAymBF73iigfsgHkbgMi08QTsNv1xqCZuh0q4R31+XHTPpSFES/op 3jgQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=+CroxZSGgFBJaJviyJ2+tFo8WZampxec0P7KHE/s48A=; b=EHjeYCtiJuC+oPcPmSbUS+YatsiD3RtATqA+X/lmVoNS58nbYGvWyZxo0Wwh3qr9eu Xmh0Oj4RIjpSzdPJ6Qvvdjd+eQyidEUtvMuzN+At7Z0aPyOqitBl6C3g/M+Du0yNMr3i JRUNsRvuejupPLv8ro6z8z1hHdNUvxlYSyF8hauJF117pJknGpYLxpqOAdfWPpK1qm5L 0Nzk+ulS5UchGP1aGSuyYRYaHRh5DcfOMa7Xib5H35+9pAHVjgAHU2YzmtvQ2Md8aaUn eq+VY5cVojJ4x8Ku/629KXej14hkidIoJqvdcBm4hXVcevd28KlKuXx7xR0G9PYIPHvQ 0sSw== X-Gm-Message-State: AOAM533uc/9MZUVki1GRWaxYdf8loHXvp7FW2U5bpVDMMXfnIAwZn0Q7 WleOMiW+FsqG4u5h0x/dXCRzzULqh78= X-Google-Smtp-Source: ABdhPJy2bGhmeAd1gYWO2qbo9JZKNJNqDWMi4RQhZvdHPvOuougtI0uYPmb06QIvN22C/eOy3jKfOQ== X-Received: by 2002:a17:90a:6a0d:: with SMTP id t13mr9067599pjj.208.1599230476724; Fri, 04 Sep 2020 07:41:16 -0700 (PDT) Received: from neutron.hitronhub.home (S010664777da04f43.vf.shawcable.net. [70.68.94.152]) by smtp.gmail.com with ESMTPSA id g129sm6972872pfb.33.2020.09.04.07.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 07:41:16 -0700 (PDT) From: Mike Rosset Date: Fri, 4 Sep 2020 07:40:53 -0700 Message-Id: <20200904144053.1981499-3-mike.rosset@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200904144053.1981499-1-mike.rosset@gmail.com> References: <20200904144053.1981499-1-mike.rosset@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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