From patchwork Tue Mar 21 12:59:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 48504 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 86DE616F54; Tue, 21 Mar 2023 13:00:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B647816F44 for ; Tue, 21 Mar 2023 13:00:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pebax-0000IT-UR; Tue, 21 Mar 2023 09:00:09 -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 1pebat-0000Hz-GZ for guix-patches@gnu.org; Tue, 21 Mar 2023 09:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pebat-0003bp-2s for guix-patches@gnu.org; Tue, 21 Mar 2023 09:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pebas-000662-Kk for guix-patches@gnu.org; Tue, 21 Mar 2023 09:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62330] [PATCH core-updates] gnu: git: Fix missing native-inputs after commit a973e1484d. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 13:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62330 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62330@debbugs.gnu.org Cc: andreas@enge.fr, Kaelyn Takata X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167940356323336 (code B ref -1); Tue, 21 Mar 2023 13:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2023 12:59:23 +0000 Received: from localhost ([127.0.0.1]:57865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pebaE-00064J-V8 for submit@debbugs.gnu.org; Tue, 21 Mar 2023 08:59:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:59056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pebaD-00064C-NP for submit@debbugs.gnu.org; Tue, 21 Mar 2023 08:59:22 -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 1pebaD-00081A-6I for guix-patches@gnu.org; Tue, 21 Mar 2023 08:59:21 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pebaA-0003OA-DM for guix-patches@gnu.org; Tue, 21 Mar 2023 08:59:20 -0400 Date: Tue, 21 Mar 2023 12:59:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1679403555; x=1679662755; bh=5qG6gzyKOrC1BXPNZCbqMfQx9tgphCllF2Y7ri3kWfw=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=gJX71v7vmd+A/XHXx0ft9tjIkYuuTctLsWjn6j9h4qVuwnv/AqHQizsR+l9TUqs7m drVLjZSjA++cPo3kt/8fDvi/rmD1nl++pzbheVGt9Jc2/prjg79b3tNONhFNISao19 EFD3R2BWY22A3L2eqrqizgfc8Oe2hg0ZP99YUu7dK9TspBb33RkldKXiHqKX9wy/bX 2yKNSYo22guo+CNV6YvIg3AAhYe7hRwMf1y2CriQ1vmTHknmSdK9KWejsrta0mm4+Y OYmW5WSPx52IIkB+X0Dog3zEyBfRPlrkDetAIJhqvHRfcHP9cwNEUkpFw4BXt4rR7Y w8NS4hopOE4oA== Message-ID: <0066b78f7af1ccde8f5b92d0eeb59ce4302cf6bc.1679403531.git.kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.134; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-40134.protonmail.ch 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_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git)[native-inputs]: Restore native-inputs to what they were prior to the merge commit a973e1484d. --- gnu/packages/version-control.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) base-commit: a973e1484d46e4b144c0f7852ad4d19c7a877664 -- 2.39.1 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index dd5692527d..c9fb66c8c9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -255,9 +255,12 @@ (define-public git "09cva868qb4705s884dzvbwkm78jlw4q8m6xj7nd7cwxy2i2ff8b")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) + ("docbook2x" ,docbook2x) ("docbook-xsl" ,docbook-xsl) - ("xmlto" ,xmlto) - ("pkg-config" ,pkg-config))) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo) + ("xmlto" ,xmlto))) (inputs `(("curl" ,curl) ("expat" ,expat)