From patchwork Thu Oct 12 02:48:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 54760 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 29AFE27BBE2; Thu, 12 Oct 2023 03:50:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 D8D8327BBE9 for ; Thu, 12 Oct 2023 03:50:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqllf-0007kB-PB; Wed, 11 Oct 2023 22:49:43 -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 1qqlle-0007js-5z for guix-patches@gnu.org; Wed, 11 Oct 2023 22:49:42 -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 1qqlld-0001uf-T6; Wed, 11 Oct 2023 22:49:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qqlly-0003eZ-9g; Wed, 11 Oct 2023 22:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66436] [PATCH 1/2] gnu: git-lfs: Patch /bin/sh references. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 12 Oct 2023 02:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66436 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66436@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 66436-submit@debbugs.gnu.org id=B66436.169707897913981 (code B ref 66436); Thu, 12 Oct 2023 02:50:02 +0000 Received: (at 66436) by debbugs.gnu.org; 12 Oct 2023 02:49:39 +0000 Received: from localhost ([127.0.0.1]:40296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqlla-0003dL-Bm for submit@debbugs.gnu.org; Wed, 11 Oct 2023 22:49:39 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:59831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqllT-0003cp-Ao for 66436@debbugs.gnu.org; Wed, 11 Oct 2023 22:49:35 -0400 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-774141bb415so30902085a.3 for <66436@debbugs.gnu.org>; Wed, 11 Oct 2023 19:49:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697078943; x=1697683743; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZgKi7EpEvjW0mbT/V2tMCSKIl6GMHrB+TffsyDgJk5c=; b=mS2e0UQsXXUdatYDZ8Kw2EHcOOgVwVNNU/u5LNfwbKG91lFIzOWNLP1pGs2d8kQO/5 sPxY/jctNxNxD0SkQzTCarf3ITOKctkGKw/ysNSte8iEzvN4R/GqNhzoiVHN9mQdizYm pjhgkB9XMMwSMlSs9LgnhE/OktyWD8o2S+weGcWpRrdNu/ASMfV4D/C+4d39CmRjB2Ov bO6ZdYlGzZHPSXhxE8qm5s+G+UkzGIEXbJjVNPmsWgU+6BLL9MbIO4B2+2NNpbuPLYXR 8+968Cfxw8vhBRgsEkvfTF0UJ/cvolU8rmtyC66XRjaRALp2F2DiSAJ+8u5RwXXpXpq7 DgcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697078943; x=1697683743; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZgKi7EpEvjW0mbT/V2tMCSKIl6GMHrB+TffsyDgJk5c=; b=kITQhG39ZB8+5XlyT2Jp1DjXW9c6/Qqh+yiIqedJMEW+cHjeGALS41hgpc1/iMrz7Z SZKZD27bn7BbAS4snZGRsMqWVG5CHXHmdD+/oVV6pGH1Kt7123lDrhtIMIs7EEr6dUaq iVvlZBJlomKOQw0RL2J54Am4ShIV/tIfvXAMMUQ1yyhkUoK2oe5aJ+N1VJwh8MoM+PHx bMzkV5BHkaf3VCWm3ARBCATOEyg6/IexdQqTtLCvFetdWouRGQveOEj2883lGTccXSOE 46zY6ifBA1NI2Y9/b1wLChHndTQnOCD2GqEPP2nGIim2pdP3WNRKyLxdwHW5DHY661m9 NF6g== X-Gm-Message-State: AOJu0YxIKYQZIycEx5hpuiyEfo+lZ609IK4OkTG/azQswPYI5HMl9A/1 2j88arkK+6qRDK1GCd5HSMqJboyLNdY= X-Google-Smtp-Source: AGHT+IGdkyWoFOSGI9whL4coIp2TXQCRfOWbMp03vPTHjCdxTSjwORewNQcuO08lEWt3AMCRZzhJqA== X-Received: by 2002:a05:620a:40d2:b0:774:1474:a819 with SMTP id g18-20020a05620a40d200b007741474a819mr25054887qko.71.1697078943384; Wed, 11 Oct 2023 19:49:03 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-66.b2b2c.ca. [72.10.128.66]) by smtp.gmail.com with ESMTPSA id f10-20020a05620a15aa00b007659935ce64sm5671657qkk.71.2023.10.11.19.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 19:49:02 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 11 Oct 2023 22:48:41 -0400 Message-ID: <2343e018a06ef7e1ce7d9d7cc2e6d30c76027277.1697078865.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git-lfs) [arguments]: Add patch-/bin/sh phase. Change-Id: I2d455e683e4f6e30cd32f5b1fdaccac71616826c --- gnu/packages/version-control.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d9c53af71c..04b52f2a85 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3175,6 +3175,11 @@ (define-public git-lfs #:install-source? #f #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/github.com/git-lfs/git-lfs/lfs/hook.go" + (("/bin/sh") + (search-input-file inputs "bin/sh"))))) (add-after 'unpack 'fix-embed-x-net (lambda _ (delete-file-recursively "src/golang.org/x/net/publicsuffix/data")