From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id AAJGF8slcGbHxwAAe85BDQ:P1 (envelope-from ) for ; Mon, 17 Jun 2024 12:02:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id AAJGF8slcGbHxwAAe85BDQ (envelope-from ) for ; Mon, 17 Jun 2024 14:02:19 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ZtB5YEma; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718625739; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=ZGwKRDVdQLTgCdvPHnXr2aUDUUuf7tzHYO1P5f0yuTI=; b=M+prn0sLPnGaEnWGLHCJBStKHRBK88AmPyIPS2ll3uxPYVMOqXr6FWafUu3XzQ0+5yvTA5 YqDmiaWuP2iTacnBGjuvAOHfGt/BmeRI7qWZ2GcdHQ3FuTyDx5SHgGHY0JVY2WO4fBHlC7 w04k/Lu9afRZwbhwZE3K1vtH+cF1Q8GUP3WysE1syvBnklIz25I2S3fMMK68lEmmxPDMiP 0Q1paIJZNrbIB2WwHR0C1uaXHmVld3jBysqvqIc4cXritkePcDaljAa8Z72TCnap7upKch E0ir5wAnKiqUBR8lG2S6G3R80Z70hqLNqAhv4FPOQHrBTlxTPxw5Yj5pkvxNjw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ZtB5YEma; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718625739; a=rsa-sha256; cv=none; b=cVZdGzd5DrSEgA621GHsMB/GXMgM6nLLWO8XcNpAuH3CJW17wrL8gs4Cs4nLvnAv3eIThk RzdYw9dlRqfRQljr5DggqJ1A1ZU2dDAuUx9dJLmBR3A/B+YbvbuJhrdrRhS5YA7/w5zAgh iE6gEgS5E3QW0JOATLSgYHp3m8ms0PQ5KAvoQYdAzbaaf3kMNT1fPG9shQCTTGs4QWC3qf ihe/9AZ5fc4kk7HuVRXCF4Q+hWD7KR2tBGw4qbH4bou6HcteNluA0LAeSs+c6wxrj/70in O4cmZlx82WH4zZM75MQMlb2YFvExd4RarDSSJf3THBtWdflySjuj5YvClnFisg== 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 20AE963FB5 for ; Mon, 17 Jun 2024 14:02:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJB3i-0008F6-By; Mon, 17 Jun 2024 08:02:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJB3g-0008EO-BX for guix-patches@gnu.org; Mon, 17 Jun 2024 08:02:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJB3g-0001ei-37 for guix-patches@gnu.org; Mon, 17 Jun 2024 08:02:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJB3h-0002yB-Vt; Mon, 17 Jun 2024 08:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71592] [PATCH v2 1/4] gnu: emacs-org: Update to 9.7.4. Resent-From: "Suhail Singh" Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 17 Jun 2024 12:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71592 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71592@debbugs.gnu.org Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 71592-submit@debbugs.gnu.org id=B71592.171862569811369 (code B ref 71592); Mon, 17 Jun 2024 12:02:01 +0000 Received: (at 71592) by debbugs.gnu.org; 17 Jun 2024 12:01:38 +0000 Received: from localhost ([127.0.0.1]:60899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJB3K-0002xJ-GN for submit@debbugs.gnu.org; Mon, 17 Jun 2024 08:01:38 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:39544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJB3H-0002x2-P3 for 71592@debbugs.gnu.org; Mon, 17 Jun 2024 08:01:36 -0400 Received: by mail-qt1-f195.google.com with SMTP id d75a77b69052e-43fe599b612so3560671cf.2 for <71592@debbugs.gnu.org>; Mon, 17 Jun 2024 05:01:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718625628; x=1719230428; darn=debbugs.gnu.org; h=mime-version:user-agent:date:references:message-id:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZGwKRDVdQLTgCdvPHnXr2aUDUUuf7tzHYO1P5f0yuTI=; b=ZtB5YEmanGaebjfttx/dbZMu7Ii3YpsXYMWJ4rVS398/+C0U2cQRu7EXOTldzinyCW +3PR3jG1C4jCsdJwXqwC0eSvGvcOaEpASSDuftBiWCpbAwokITNsrvXH9ZZIYCr5xi50 heLhNxY3uVVHnDvhprpLGYIyEPFuYaxoWtYdELuRj4ZQ1MO9c9dLy9RhWxdSQuZNmtlJ IiZBK1sVRBM1mNEC43KUG9XWM/Q2YxtOjN2/QxH4OnQGdA0pwBl4wt18tpdEhPUfr95W jrdlQLKUAdChDFLrFMM5niUsrqa8/KuGRmhPXdXg50AmxQ77W/Ywv+UfSvOvA6VOXlhU XucQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718625628; x=1719230428; h=mime-version:user-agent:date:references:message-id:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZGwKRDVdQLTgCdvPHnXr2aUDUUuf7tzHYO1P5f0yuTI=; b=ZxPs+Z6s7PANeDgE3+yYkQaKSbVSHuXtJBjTnLZP/1SmUOKkNSAGgFFn/mJSFipcv9 5Qlz5eIYnGA3bMKhdbwtxjbm3Zb2Kg7ljuUjg2ijLTmtIzDLsQ15nUJ1VxFN9Y2kf9RT TL4CCLWwPsp/tH3PmDrEBKWJTM/tLTWh0qmis4vd14NTveySBnUfP4X+NFntXUVS7/4y ScXNknx4CIf7GSPwVpKpXzFrK6F83E7zBLhDi92iVTUjyvK+nK/qrvYNkGIXIlomv7Oc FkYwLy0xNiKFClPpeogXYzc4M9gcaADdsXI4lgETAcicQ/1/5tgD6IhAOiXhYQ9V59tg RjOw== X-Gm-Message-State: AOJu0YxPW7kYDlFTLTeqA1yXtyLPbsB3cJua1nFvhY5vXfJsiob4Ye2u KEXh0MQYQMAxEBMZD2Kv/BDBVo9RyweotL/lrdaD4cwMEEWGcBqoaNBXAoty X-Google-Smtp-Source: AGHT+IHNSH44lNJqenMv6msFDvahHrMHRmiHm3HDPRno4/+KJ0eTRcXHVArGmK1uCDn3xDb27Nwj3Q== X-Received: by 2002:ac8:7e89:0:b0:440:565a:920a with SMTP id d75a77b69052e-442168845cbmr104742431cf.2.1718625627615; Mon, 17 Jun 2024 05:00:27 -0700 (PDT) Received: from gnus (static-198-54-132-177.cust.tzulo.com. [198.54.132.177]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-441f2ff9ef8sm45932621cf.89.2024.06.17.05.00.27 for <71592@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 05:00:27 -0700 (PDT) From: "Suhail Singh" In-Reply-To: Message-ID: References: Date: Mon, 17 Jun 2024 08:00:26 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 20AE963FB5 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.76 X-Spam-Score: -3.76 X-TUID: jZuJhb48Rodq * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.7.4. Change-Id: Iec5f62a5d4a8c23f939aef118473b81a2dc9122b --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index da4a2340fe..307950aacd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17118,7 +17118,7 @@ (define-public emacs-neotree (define-public emacs-org (package (name "emacs-org") - (version "9.6.30") + (version "9.7.4") (source (origin (method git-fetch) @@ -17127,7 +17127,7 @@ (define-public emacs-org (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0v4b3yl4limrq3jgf0jvvx73cs7d36p14c2x93pdvn50mjykii3f")))) + (base32 "00crs2q4yvmv2jgzmcfyl2g6m7g42zpggyssmcj8anwrsp748z9b")))) (build-system emacs-build-system) (arguments (list @@ -17156,12 +17156,25 @@ (define-public emacs-org (for-each make-file-writable '("babel.org" "ob-awk-test.org" - "ob-sed-test.org" - "ob-shell-test.org")) + "ob-sed-test.org")) ;; Specify where sh executable is. (let ((sh (search-input-file inputs "/bin/sh"))) (substitute* "babel.org" (("/bin/sh") sh)))) + ;; XXX: Fix failure in ob-tangle/collect-blocks. The test + ;; assumes that ~/../.. corresponds to /. This isn't true in + ;; our case. + (substitute* "testing/lisp/test-ob-tangle.el" + ((" ~/\\.\\./\\.\\./") + (string-append " ~" + ;; relative path from ${HOME} to / during + ;; build + (string-join + (map-in-order + (lambda (x) + (if (equal? x "") "" "..")) + (string-split (getcwd) #\/)) "/") + "/"))) ;; XXX: Skip failing tests. (substitute* "testing/lisp/test-ob-shell.el" (("ob-shell/remote-with-stdin-or-cmdline .*" all) -- 2.45.2