From unknown Thu Jun 19 16:18:43 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#66475 <66475@debbugs.gnu.org> To: bug#66475 <66475@debbugs.gnu.org> Subject: Status: [PATCH 0/2] Add support for Git Large File Storage (LFS). Reply-To: bug#66475 <66475@debbugs.gnu.org> Date: Thu, 19 Jun 2025 23:18:43 +0000 retitle 66475 [PATCH 0/2] Add support for Git Large File Storage (LFS). reassign 66475 guix-patches submitter 66475 Maxim Cournoyer severity 66475 normal tag 66475 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 11 22:50:21 2023 Received: (at submit) by debbugs.gnu.org; 12 Oct 2023 02:50:21 +0000 Received: from localhost ([127.0.0.1]:40315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqlmG-0003fp-O5 for submit@debbugs.gnu.org; Wed, 11 Oct 2023 22:50:21 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqlmB-0003fM-PZ for submit@debbugs.gnu.org; Wed, 11 Oct 2023 22:50:19 -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 1qqllh-0007ks-O9 for guix-patches@gnu.org; Wed, 11 Oct 2023 22:49:45 -0400 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqllb-0001uW-Us for guix-patches@gnu.org; Wed, 11 Oct 2023 22:49:45 -0400 Received: by mail-qt1-x835.google.com with SMTP id d75a77b69052e-41954a3e282so3021851cf.2 for ; Wed, 11 Oct 2023 19:49:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697078978; x=1697683778; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=qDFlAJJjouGwwLSL9KA3dYgCcwwL8Jh0WuZy8NWlQBE=; b=nVnfZnUeznarvHbKR9qofXcdqsh28mZRvLBJ/P2jBrxWuiK8bDMWuJov+gONweFmIG KCDJIOQ5099ijC0rbh5y1+30TA2xoLkubGAQWSIegZ8YMIXFCUP+mlNiylOwIetJgAJK 3mgUG6m7nT3HHPasOpMtecM8l+yKv6+8GZ1Cr5I4ghnrARZ4AqHhYAfHJqzy4A1tAUuC rlQuj70suFlEsYyeQfGQ36gfq+caxuh9QrCli6Cx0GwclltdRb04+LspsCUaYFS8JqRe EXZt4WH7Bx6y0XVE906S3s9OzwuTnpoRbzW/rIlzmIYZ2UIlLn/0e1QR25gN4GQCCEJD 62OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697078978; x=1697683778; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qDFlAJJjouGwwLSL9KA3dYgCcwwL8Jh0WuZy8NWlQBE=; b=ZAZgYw+MARaHDOfNPHU7HMMsogq7b9p3rmXo5Cvjj9du2fAd5AMpVod42/3s+netzN ffaLh5oh9zzpbVEpPz7JtYhvGJPGlQzVtow6msg0YrHn+rniCEhDN19oTYpKJUzC+UnD UrimlUUB0a/JFFIPv4+rVrn/pSYBtKlQaG/FM851BWSzJzHlZQvSn9dK4vL16YTFY+Ff QhM9UYt06cmqxiExwWGiDbieDXVSFeF+DXN5+PNleSw+YO6PQMvu4VGOGmvqR2l9IXYP pCAR1oNklq8YO6c0ih52DlfuqWICuakO1oDix7hUDT4a7tc3g0j0S9WkuLQii+CIWrox UhFQ== X-Gm-Message-State: AOJu0YzxXckwzzLHSYIoIBDQWGXAj+Fbb/70muPq2521G0o/BK+lX79m aN2ttafiwgygxmPGfz4pLiKmD1qmT8o= X-Google-Smtp-Source: AGHT+IEkMGmWxTHvEWRhrjQT8hbM/sYwDk+Ib1EOzr6mZDOZf388RVjUKzYaujsbRKBiClC1KURl5Q== X-Received: by 2002:ac8:5b0c:0:b0:419:4e1c:68fd with SMTP id m12-20020ac85b0c000000b004194e1c68fdmr27844051qtw.6.1697078978450; Wed, 11 Oct 2023 19:49:38 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-66.b2b2c.ca. [72.10.128.66]) by smtp.gmail.com with ESMTPSA id jr5-20020a05622a800500b00417f330026bsm5828916qtb.49.2023.10.11.19.49.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 19:49:38 -0700 (PDT) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH 0/2] Add support for Git Large File Storage (LFS). Date: Wed, 11 Oct 2023 22:49:33 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::835; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x835.google.com 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) While updating orcus to its latest version (0.19.0), I stumbled on a test a failure, which ended up being caused by the lack of test files in the repository checkout. These files are stored using the LFS extension in the repo; when not using LFS, empty text stubs with some metadata are left in their place. I've opted to keep the dependency on git-lfs optional for now for the daemon. The git in-band downloader will only add the git-lfs dependency when the git-reference object has its lfs? field set to true. Maxim Cournoyer (2): gnu: git-lfs: Patch /bin/sh references. git-download: Add support for Git Large File Storage (LFS). configure.ac | 10 ++++++ doc/guix.texi | 9 +++++ gnu/packages/version-control.scm | 5 +++ guix/build/git.scm | 18 +++++++--- guix/config.scm.in | 4 +++ guix/git-download.scm | 58 ++++++++++++++++++++----------- guix/scripts/perform-download.scm | 3 ++ guix/self.scm | 10 +++++- 8 files changed, 92 insertions(+), 25 deletions(-) base-commit: d6d706a58b8159748d3a46fa97cae18850487c8a -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 11 23:02:52 2023 Received: (at 66475) by debbugs.gnu.org; 12 Oct 2023 03:02:52 +0000 Received: from localhost ([127.0.0.1]:40337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqlyN-0004Ez-Ec for submit@debbugs.gnu.org; Wed, 11 Oct 2023 23:02:51 -0400 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:58582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqlyH-0004Eg-Cg for 66475@debbugs.gnu.org; Wed, 11 Oct 2023 23:02:50 -0400 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-66d0ceba445so3067506d6.0 for <66475@debbugs.gnu.org>; Wed, 11 Oct 2023 20:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697079737; x=1697684537; 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=h3VN6+zxHaAZ1jN6zAVzAvYc6hRQXcx9jKzLDBBA0grsBlkvwXiggaUvUazIMJwFWn AoKQmm0feuMHyTBNWiPDuGjL+qifYNy0KHRz66lunnk/OIvoIhveIj1xSHUFfBnQCIRE VKBA+blDclxXCpZb+6RFPm7fNppNbwuqVmz2zX/x961GFiDD7QEjPwBEmRklcgsLTPCl ZBogCoYDVK7EnMmA8JsxG8wIavUj7Kihfyoc8aaRwb0nz3dcnaTVyvQ8SkvKPoF5nq5a wstSHJII4f6kXN0wamuEdGOsAPOpERndVDpCt51PIAdfyLRX5FOpO3ut80Z81xSMYnth KCgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697079737; x=1697684537; 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=LA9IJA9ydAMNyHECvyDQLCKF+FGIe8NLuVA+0nhxhyxA2t4NCbLKvdJ5tcuCgKOvO0 8Skvc87SaiTn+y/3H+td4W/aSVcLbxgATakASAI/o3aOR1/qy28aWGY1RLAqb9miPV4o kmY/yNXGHwHqfn5vN525XgFvZVMIB7stp+dizyuBVVml91tnxpPfGrGVNdzY+RKM6ius 5Lr1k4i1T1QWlR9nMm5K/bF5tH2l5h9b3SYF7hvBm0sfuK/4dg5EsxcU4U9WljQFD3lP DVmeazcQbTR0cKGcRc2jc1vv2VMKTh4AsM6kSDV+nDPa7tjxSJ9hSk5UzsX2HVHohnHQ /I1A== X-Gm-Message-State: AOJu0Yz1kHT4/agN8Fkg873kCFnbfw430CDq64hpQXmqCai+u6XXvsKa +u+qmo6z/H6G4EA/dZWqvVM8SODSnHU= X-Google-Smtp-Source: AGHT+IHyFulm1eO7yC1Ag4fvqvMlF7ytKa7RVFTzYjWXieDuKOZnAyhtSJSiu8gGPbZNSPD67EIQDA== X-Received: by 2002:a0c:ab4e:0:b0:657:d1d5:7c9 with SMTP id i14-20020a0cab4e000000b00657d1d507c9mr19196607qvb.12.1697079737434; Wed, 11 Oct 2023 20:02:17 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-66.b2b2c.ca. [72.10.128.66]) by smtp.gmail.com with ESMTPSA id qq16-20020a0562142c1000b0066d0ab215b5sm809059qvb.13.2023.10.11.20.02.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 20:02:16 -0700 (PDT) From: Maxim Cournoyer To: 66475@debbugs.gnu.org Subject: [PATCH 1/2] gnu: git-lfs: Patch /bin/sh references. Date: Wed, 11 Oct 2023 23:02:03 -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-Debbugs-Cc: Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66475 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 11 23:03:22 2023 Received: (at 66475) by debbugs.gnu.org; 12 Oct 2023 03:03:22 +0000 Received: from localhost ([127.0.0.1]:40342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqlyr-0004GA-34 for submit@debbugs.gnu.org; Wed, 11 Oct 2023 23:03:21 -0400 Received: from mail-vs1-xe32.google.com ([2607:f8b0:4864:20::e32]:44053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqlym-0004Ft-Rv for 66475@debbugs.gnu.org; Wed, 11 Oct 2023 23:03:20 -0400 Received: by mail-vs1-xe32.google.com with SMTP id ada2fe7eead31-4527d65354bso245006137.0 for <66475@debbugs.gnu.org>; Wed, 11 Oct 2023 20:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697079769; x=1697684569; 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=vfTYc6L7D6jFFhzqJ9mhyYLfJoP8PrxeLPkO1ed2HBI=; b=MND7X8/1c/1FZ2ThF+D/S05zHPMO9DOYDjNEBHY9XqOzYWoqNks1eWI5UISsozvZQw EwKsRp3h/RpXulX0ZkfsqMyF0JuKWUdNZsESX2T5FmLpkyMX/XwEdLfkjo+mu/H+6aci i/Q2Wnh3+m1nIoFkZQYej/H9yC1/gf7DHa7vWW6FcFSfOPeDoWDA6HbnoIuUIIJtU7VL 18XHlVkX76setiUIHiSE3sgC3RslfK3X2gk+YP/sPKpN8Tq4YmEMurHUxS6Zkwsq3l8Q RXLGvmblCOS88Cr8ZxxRoQoBpvIxmHIWs2hV+1gXPJ+Yuz5vJUF6GARCZkmdVCmH5kWN 5qYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697079769; x=1697684569; 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=vfTYc6L7D6jFFhzqJ9mhyYLfJoP8PrxeLPkO1ed2HBI=; b=jWxLwDcY2mZiubZ7J2kt9Ns3pMQfGrXO0nXgW5RC3NAwODkYPXim1GBN8RHdxNiqYL LPiYK3qy/JoPtQV0nhaniT+a1QmsHODW5k0zxz0JGpr4PATn+K5H24BmAeLcUHC4Wnye LNyrZbBNClR5t1/DW3xJRFItfLZbnt50RL2yr80felgxcn00pWfsKjIrTX/+d5MZ8yRI fM0firK501Uiu5VjAicdMUIIZUbQcfjtYGn15WbjnSNv+HndHzgR8h96T+KCBkZl6pRd sL0h8/6OMCPdOUtv8fxIOQv8KIDBX7t51+aHqzH0F0cilJ2if4BRYi4YBW3pBvq0ZPnC MfDQ== X-Gm-Message-State: AOJu0YztL/WLtiZglPQb7FqTz7BNxnepg+TLRJ+sjYoGh/iL90Ex8wPH XIwFj77SdL5SVIi7dge7pR8VxsrZPs8= X-Google-Smtp-Source: AGHT+IEZsD0UjffFFavYsD8FvjGmsPk5+RBxdfmFieH/BdZdXzwgQ3rT4nd16MbgzmrCHOTsWYWe3A== X-Received: by 2002:a67:e207:0:b0:452:658b:295e with SMTP id g7-20020a67e207000000b00452658b295emr20914202vsa.12.1697079768649; Wed, 11 Oct 2023 20:02:48 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-66.b2b2c.ca. [72.10.128.66]) by smtp.gmail.com with ESMTPSA id qq16-20020a0562142c1000b0066d0ab215b5sm809059qvb.13.2023.10.11.20.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 20:02:48 -0700 (PDT) From: Maxim Cournoyer To: 66475@debbugs.gnu.org Subject: [PATCH 2/2] git-download: Add support for Git Large File Storage (LFS). Date: Wed, 11 Oct 2023 23:02:04 -0400 Message-ID: <58269ccea06b016c38d3bea8678608c8cccce1ca.1697078865.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66475 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/git-download.scm () [lfs?]: New field. (git-fetch/in-band): New #:git-lfs argument. : Remove labels. Conditionally add git-lfs. : Read "git lfs?" environment variable and pass its value to the #:lfs? argument of git-fetch-with-fallback. Use INPUTS directly; update comment. derivation>: Add "git lfs?" to #:env-vars. (git-fetch/built-in): Add "lfs?" to #:env-vars. * guix/build/git.scm (git-fetch) [lfs?]: New argument, doc and setup code. (git-fetch-with-fallback) [lfs?]: New argument. Pass it to git-fetch. * guix/scripts/perform-download.scm (perform-git-download): Honor the 'lfs?' environment variable. * doc/guix.texi (origin Reference) : Document the new 'lfs?' field. (Requirements): Mention the optional 'git-lfs' dependency. * configure.ac: Add a check for the 'git-lfs' command. * guix/config.scm.in (%git-lfs): New variable. * guix/self.scm (%packages): Add git-lfs. (compiled-guix): Add git-lfs to guix-config. (make-config.scm): New #:git-lfs argument. Change-Id: I5b233b8642a7bdb8737b9d9b740e7254a89ccb25 --- configure.ac | 10 ++++++ doc/guix.texi | 9 +++++ guix/build/git.scm | 18 +++++++--- guix/config.scm.in | 4 +++ guix/git-download.scm | 58 ++++++++++++++++++++----------- guix/scripts/perform-download.scm | 3 ++ guix/self.scm | 10 +++++- 7 files changed, 87 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index d817f620cf..5342c0f80e 100644 --- a/configure.ac +++ b/configure.ac @@ -208,6 +208,16 @@ if test "x$GIT" = "x"; then fi AC_SUBST([GIT]) +dnl Git Large File Storage is an optional dependency for the +dnl "builtin:git-download" derivation builder. +AC_PATH_PROG([GIT_LFS], [git-lfs]) +if test "x$GIT_LFS" = "x"; then + AC_MSG_WARN([Git Large File Storage (git-lfs) is missing; + The builtin:git-download derivation builder of the Guix daemon will + not be able to use it.]) +fi +AC_SUBST([GIT_LFS]) + LIBGCRYPT_LIBDIR="no" LIBGCRYPT_PREFIX="no" diff --git a/doc/guix.texi b/doc/guix.texi index dc16ec1d15..89faaa7b90 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1020,6 +1020,11 @@ Requirements The following dependencies are optional: @itemize +@item +The daemon will be able to fetch from Git repositories using the +@uref{https://git-lfs.com/, Git Large File Storage} extension when the +@command{git-lfs} command is available. + @item @c Note: We need at least 0.13.0 for #:nodelay. Support for build offloading (@pxref{Daemon Offload Setup}) and @@ -8499,6 +8504,10 @@ origin Reference @command{git describe} style identifier such as @code{v1.0.1-10-g58d7909c97}. +@item @code{lfs?} (default: @code{#f}) +This Boolean indicates whether to fetch Git large file storage (LFS) +files. + @item @code{recursive?} (default: @code{#f}) This Boolean indicates whether to recursively fetch Git sub-modules. @end table diff --git a/guix/build/git.scm b/guix/build/git.scm index 0ff263c81b..82c31fabf1 100644 --- a/guix/build/git.scm +++ b/guix/build/git.scm @@ -33,10 +33,13 @@ (define-module (guix build git) ;;; Code: (define* (git-fetch url commit directory - #:key (git-command "git") recursive?) + #:key (git-command "git") + lfs? recursive?) "Fetch COMMIT from URL into DIRECTORY. COMMIT must be a valid Git commit -identifier. When RECURSIVE? is true, all the sub-modules of URL are fetched, -recursively. Return #t on success, #f otherwise." +identifier. When LFS? is true, configure Git to also fetch Large File +Storage (LFS) files; it assumes that the @code{git-lfs} extension is available +in the environment. When RECURSIVE? is true, all the sub-modules of URL are +fetched, recursively. Return #t on success, #f otherwise." ;; Disable TLS certificate verification. The hash of the checkout is known ;; in advance anyway. @@ -57,6 +60,11 @@ (define* (git-fetch url commit directory (with-directory-excursion directory (invoke git-command "init" "--initial-branch=main") (invoke git-command "remote" "add" "origin" url) + + (when lfs? + (setenv "HOME" "/tmp") + (invoke git-command "lfs" "install")) + (if (zero? (system* git-command "fetch" "--depth" "1" "origin" commit)) (invoke git-command "checkout" "FETCH_HEAD") (begin @@ -81,11 +89,13 @@ (define* (git-fetch url commit directory (define* (git-fetch-with-fallback url commit directory - #:key (git-command "git") recursive?) + #:key (git-command "git") + lfs? recursive?) "Like 'git-fetch', fetch COMMIT from URL into DIRECTORY, but fall back to alternative methods when fetching from URL fails: attempt to download a nar, and if that also fails, download from the Software Heritage archive." (or (git-fetch url commit directory + #:lfs? lfs? #:recursive? recursive? #:git-command git-command) (download-nar directory) diff --git a/guix/config.scm.in b/guix/config.scm.in index 62e15dd713..4997a1740e 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -36,6 +36,7 @@ (define-module (guix config) %system %git + %git-lfs %gzip %bzip2 %xz)) @@ -113,6 +114,9 @@ (define %system (define %git "@GIT@") +(define %git-lfs + "@GIT_LFS@") + (define %gzip "@GZIP@") diff --git a/guix/git-download.scm b/guix/git-download.scm index 5d5d73dc6b..6feeea6428 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -51,6 +51,7 @@ (define-module (guix git-download) git-reference? git-reference-url git-reference-commit + git-reference-lfs? git-reference-recursive? git-fetch @@ -71,7 +72,9 @@ (define-record-type* git-reference? (url git-reference-url) (commit git-reference-commit) - (recursive? git-reference-recursive? ; whether to recurse into sub-modules + (lfs? git-reference-lfs? ;whether to fetch LFS files + (default #f)) + (recursive? git-reference-recursive? ;whether to recurse into sub-modules (default #f))) (define (git-package) @@ -79,11 +82,17 @@ (define (git-package) (let ((distro (resolve-interface '(gnu packages version-control)))) (module-ref distro 'git-minimal))) +(define (git-lfs-package) + "Return the default 'git-lfs' package." + (let ((distro (resolve-interface '(gnu packages version-control)))) + (module-ref distro 'git-lfs))) + (define* (git-fetch/in-band ref hash-algo hash #:optional name #:key (system (%current-system)) (guile (default-guile)) - (git (git-package))) + (git (git-package)) + (git-lfs (git-lfs-package))) "Return a fixed-output derivation that performs a Git checkout of REF, using GIT and GUILE (thus, said derivation depends on GIT and GUILE). @@ -91,18 +100,22 @@ (define* (git-fetch/in-band ref hash-algo hash It will be removed when versions of guix-daemon implementing \"builtin:git-download\" will be sufficiently widespread." (define inputs - `(("git" ,(or git (git-package))) - - ;; When doing 'git clone --recursive', we need sed, grep, etc. to be - ;; available so that 'git submodule' works. + `(,(or git (git-package)) + ,@(if (git-reference-lfs? ref) + (list (or git-lfs (git-lfs-package))) + '()) ,@(if (git-reference-recursive? ref) - (standard-packages) + ;; TODO: remove (standard-packages) after + ;; 48e528a26f9c019eeaccf5e3de3126aa02c98d3b is merged into master; + ;; currently when doing 'git clone --recursive', we need sed, grep, + ;; etc. to be available so that 'git submodule' works. + (map second (standard-packages)) ;; The 'swh-download' procedure requires tar and gzip. - `(("gzip" ,(module-ref (resolve-interface '(gnu packages compression)) - 'gzip)) - ("tar" ,(module-ref (resolve-interface '(gnu packages base)) - 'tar)))))) + (list (module-ref (resolve-interface '(gnu packages compression)) + 'gzip) + (module-ref (resolve-interface '(gnu packages base)) + 'tar))))) (define guile-json (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4)) @@ -126,7 +139,7 @@ (define* (git-fetch/in-band ref hash-algo hash (define build (with-imported-modules modules - (with-extensions (list guile-json gnutls ;for (guix swh) + (with-extensions (list guile-json gnutls ;for (guix swh) guile-lzlib) #~(begin (use-modules (guix build git) @@ -134,6 +147,9 @@ (define* (git-fetch/in-band ref hash-algo hash #:select (set-path-environment-variable)) (ice-9 match)) + (define lfs? + (call-with-input-string (getenv "git lfs?") read)) + (define recursive? (call-with-input-string (getenv "git recursive?") read)) @@ -144,18 +160,17 @@ (define* (git-fetch/in-band ref hash-algo hash #+(file-append glibc-locales "/lib/locale")) (setlocale LC_ALL "en_US.utf8") - ;; The 'git submodule' commands expects Coreutils, sed, - ;; grep, etc. to be in $PATH. - (set-path-environment-variable "PATH" '("bin") - (match '#+inputs - (((names dirs outputs ...) ...) - dirs))) + ;; The 'git submodule' commands expects Coreutils, sed, grep, + ;; etc. to be in $PATH. This also ensures that git extensions are + ;; found. + (set-path-environment-variable "PATH" '("bin") '#+inputs) (setvbuf (current-output-port) 'line) (setvbuf (current-error-port) 'line) (git-fetch-with-fallback (getenv "git url") (getenv "git commit") #$output + #:lfs? lfs? #:recursive? recursive? #:git-command "git"))))) @@ -175,13 +190,15 @@ (define* (git-fetch/in-band ref hash-algo hash (git-reference-url ref)))) ("git commit" . ,(git-reference-commit ref)) ("git recursive?" . ,(object->string - (git-reference-recursive? ref)))) + (git-reference-recursive? ref))) + ("git lfs?" . ,(object->string + (git-reference-lfs? ref)))) #:leaked-env-vars '("http_proxy" "https_proxy" "LC_ALL" "LC_MESSAGES" "LANG" "COLUMNS") #:system system - #:local-build? #t ;don't offload repo cloning + #:local-build? #t ;don't offload repo cloning #:hash-algo hash-algo #:hash hash #:recursive? #t @@ -209,6 +226,7 @@ (define* (git-fetch/built-in ref hash-algo hash (_ (git-reference-url ref))))) ("commit" . ,(git-reference-commit ref)) + ("lfs?" . ,(object->string (git-reference-lfs? ref))) ("recursive?" . ,(object->string (git-reference-recursive? ref)))) #:leaked-env-vars '("http_proxy" "https_proxy" diff --git a/guix/scripts/perform-download.scm b/guix/scripts/perform-download.scm index 9aa0e61e9d..37904941d1 100644 --- a/guix/scripts/perform-download.scm +++ b/guix/scripts/perform-download.scm @@ -96,6 +96,7 @@ (define* (perform-git-download drv output 'bmRepair' builds." (derivation-let drv ((url "url") (commit "commit") + (lfs? "lfs?") (recursive? "recursive?")) (unless url (leave (G_ "~a: missing Git URL~%") (derivation-file-name drv))) @@ -103,6 +104,7 @@ (define* (perform-git-download drv output (leave (G_ "~a: missing Git commit~%") (derivation-file-name drv))) (let* ((url (call-with-input-string url read)) + (lfs? (and lfs? (call-with-input-string lfs? read))) (recursive? (and recursive? (call-with-input-string recursive? read))) (drv-output (assoc-ref (derivation-outputs drv) "out")) @@ -115,6 +117,7 @@ (define* (perform-git-download drv output (setenv "PATH" "/run/current-system/profile/bin:/bin:/usr/bin") (git-fetch-with-fallback url commit output + #:lfs? lfs? #:recursive? recursive? #:git-command %git)))) diff --git a/guix/self.scm b/guix/self.scm index a1f235659d..96021be6f6 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -69,6 +69,7 @@ (define %packages ("gzip" . ,(ref 'compression 'gzip)) ("bzip2" . ,(ref 'compression 'bzip2)) ("xz" . ,(ref 'compression 'xz)) + ("git-lfs" . ,(ref 'version-control 'git-lfs)) ("git-minimal" . ,(ref 'version-control 'git-minimal)) ("po4a" . ,(ref 'gettext 'po4a)) ("gettext-minimal" . ,(ref 'gettext 'gettext-minimal)) @@ -830,6 +831,9 @@ (define* (compiled-guix source #:key (define git (specification->package "git-minimal")) + (define git-lfs + (specification->package "git-lfs")) + (define dependencies (append-map transitive-package-dependencies (list guile-gcrypt guile-gnutls guile-git guile-avahi @@ -1004,6 +1008,7 @@ (define* (compiled-guix source #:key #:bzip2 bzip2 #:xz xz #:git git + #:git-lfs git-lfs #:package-name %guix-package-name #:package-version @@ -1109,7 +1114,7 @@ (define %default-config-variables (%storedir . "/gnu/store") (%sysconfdir . "/etc"))) -(define* (make-config.scm #:key gzip xz bzip2 git +(define* (make-config.scm #:key gzip xz bzip2 git git-lfs (package-name "GNU Guix") (package-version "0") (channel-metadata #f) @@ -1140,6 +1145,7 @@ (define* (make-config.scm #:key gzip xz bzip2 git %store-database-directory %config-directory %git + %git-lfs %gzip %bzip2 %xz)) @@ -1184,6 +1190,8 @@ (define* (make-config.scm #:key gzip xz bzip2 git (define %git #+(and git (file-append git "/bin/git"))) + (define %git-lfs + #+(and git-lfs (file-append git-lfs "/bin/git-lfs"))) (define %gzip #+(and gzip (file-append gzip "/bin/gzip"))) (define %bzip2 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 16 17:29:22 2023 Received: (at 66475) by debbugs.gnu.org; 16 Oct 2023 21:29:22 +0000 Received: from localhost ([127.0.0.1]:58130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsV9O-0003dj-6Y for submit@debbugs.gnu.org; Mon, 16 Oct 2023 17:29:22 -0400 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]:57571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsV9K-0003dS-BD for 66475@debbugs.gnu.org; Mon, 16 Oct 2023 17:29:21 -0400 Received: by mail-qt1-x831.google.com with SMTP id d75a77b69052e-41b406523fcso34817251cf.2 for <66475@debbugs.gnu.org>; Mon, 16 Oct 2023 14:28:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697491727; x=1698096527; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=bPoycySVzIBWIc1Gvnuoe/xqDcmiED1D6Y8zvhTc48w=; b=SLJCCTO9JbMit3Mz0oD6/y9I87zjcSX0/U9b1/1m6NtIa4GQAh2/LpeaKkh98iSfle /njXKT2O2mJ7Y3jZMcPIZgL8Ng8DDZXSPA3G7ve/kzuGljVuwGiLkH9Vwh79tP8i6OMY PtdnO4MQgv3Y+4YfeTCe+Ms8gjrs3Ss4D8NlX/4fhK4aoHzWKBNVhdfRrXxrs6LBnguh bnfVU7aPeWKng5qgVWbVi0DqhET3jtkJUjiv5gCo86TO6Kf+sswWkfPlPS6LyKrJqQxh 9VTKih3/g37VFCAwWV7FEFRGNAWnpMUiU2BJ2pspJZyH0TUfseM2w90MRjmKg0thQO8C jXYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697491727; x=1698096527; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bPoycySVzIBWIc1Gvnuoe/xqDcmiED1D6Y8zvhTc48w=; b=PtoBY9asnF76Scg0501W+8eNteY4ziHDPIxPUULEFRTJ6iUzJIhliskhFN2m90QYkx LHO8RxAq5P+l/7oZ0QiL8azjWucdhiYMWs6G4QpdG3SiyisC+yUIER2HFLfA2eyTu+XE lxWuYJMu2k1+9OCDWh2fNBXW6hCd/MXgp7W+Ikcu6fu5s4/Diy71tIfKVv/j+nKmsBMw kSuADAl7s5rDQ2DArb+VZx5Miu/nS1mC3fzLM0DKwZMGofhv8nREgO4a6Xjo6O40Ygu4 4WnA+4QDe0oDEx0sGoyKGXFBoF0L4CyTjNrTvdwbaxoVtEfhmXG31JlM3r+HKyZgTBzf rT/g== X-Gm-Message-State: AOJu0YzgEdUovVz/V2e27UltGuAm6qnWrheZIXQdXjlNKc/xerzJCYuz KghasQZ3//C9VGv68Pc2vwEOGkxpa8tsYw== X-Google-Smtp-Source: AGHT+IG7rdqzezAhFIDJs+tgY7UINgXjiYGtvVAIuWBu+14LOlPQc3NqE0qddwv9CA4ziZzpuUszDg== X-Received: by 2002:a05:622a:1182:b0:417:d1e7:5e9b with SMTP id m2-20020a05622a118200b00417d1e75e9bmr615924qtk.26.1697491727461; Mon, 16 Oct 2023 14:28:47 -0700 (PDT) Received: from hurd (dsl-10-149-74.b2b2c.ca. [72.10.149.74]) by smtp.gmail.com with ESMTPSA id c28-20020ac86e9c000000b00417fa0cd77esm71730qtv.80.2023.10.16.14.28.46 for <66475@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 14:28:46 -0700 (PDT) From: Maxim Cournoyer To: 66475@debbugs.gnu.org Subject: Re: [bug#66475] [PATCH 1/2] gnu: git-lfs: Patch /bin/sh references. In-Reply-To: <2343e018a06ef7e1ce7d9d7cc2e6d30c76027277.1697078865.git.maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Wed, 11 Oct 2023 23:02:03 -0400") References: <2343e018a06ef7e1ce7d9d7cc2e6d30c76027277.1697078865.git.maxim.cournoyer@gmail.com> Date: Mon, 16 Oct 2023 17:28:46 -0400 Message-ID: <87y1g2uui9.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66475 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Maxim Cournoyer writes: > * 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") That one has been merged with commit b6a070d2a3c059c1a574dc4048fb8f942e008799. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 31 16:26:42 2023 Received: (at 66475) by debbugs.gnu.org; 31 Oct 2023 20:26:42 +0000 Received: from localhost ([127.0.0.1]:49307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvJy-0007IX-1S for submit@debbugs.gnu.org; Tue, 31 Oct 2023 16:26:42 -0400 Received: from mail-oi1-x233.google.com ([2607:f8b0:4864:20::233]:58633) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvJv-0007II-7s for 66475@debbugs.gnu.org; Tue, 31 Oct 2023 16:26:40 -0400 Received: by mail-oi1-x233.google.com with SMTP id 5614622812f47-3b2e22f1937so3307123b6e.1 for <66475@debbugs.gnu.org>; Tue, 31 Oct 2023 13:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698783959; x=1699388759; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=r/TGzEYAnZxkUJPCsPtS6QLIfhVilun8ebhGQY5ilGE=; b=XwmZXk67fReqQaKYSiDK8Jb5z6Z4X2ZfJ7IyOLNFN5pv1lNTuhh7oYqb7tl5VEiAHO E5JMKgVtMgCTcKw0eJKyu0fKjyrVk//T6R5aqDnmXlu2qxo/hu9SKZ7OljNX1SaPcad/ 1Ntm1HgiYYHY6JWJzYLrb19g+5/+uDfyV7tH1edP0JCYJ9I8sg3ctEtyvTv8RFCVaV0z UfteAmHzY2bSTkpmEvFD3OQc2rvvg2xzipHigf1EPGZdFJWXLqwmAvDIRULkRrEFW99I QmeImk9oyt3PPWPO5PkWOy83d3Az6rAnU54UCEd9orbQ1rmKK/92Pmptmo3vBsVkrWsv H24g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698783959; x=1699388759; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=r/TGzEYAnZxkUJPCsPtS6QLIfhVilun8ebhGQY5ilGE=; b=rJvb5jAoBC7piNc6jek+V4SaX3Vw+k31r3mVKIB/85GaM2kFIGcZv3jtJ1GwcYBHxG OC0MH/QiLNRe9+ehEgPDPFuaPnvqzj7mxEnn6tEl5SsJLFDVxgl9ZfpFTFpe2e+4GJEw PavB3bZaVkxxBALc7kVsjbtEGFnfN65+b8+eoXuko2Up/mBKRhh56+SbzmmOZabWIN8r 7qKLd5aQW+u6i+wohy6PcgOKNVE6rG/NXJUy2Mf/93lgBJlh2dSDE9ojpxP5z6o8vIcV YI9eR5VcX+/I41nAMWgk3V2sHLMHJzX+tJdwNHOPTfx1Bb0NvPmi40/2BthlL66zb1G/ SrYg== X-Gm-Message-State: AOJu0Yze39KlfJ3NiYfvq+R6nAK7s6dWP0Wt+MQr3Hfm/L/Vo1EzSpXx ogg7ualyxdbTyxRXCxo7ba8h9Ollr0o8/g== X-Google-Smtp-Source: AGHT+IHM4SQYGRVbmUHtjQNUfxYCrl3D9u6prQIByG0oIEQNqF9ixrM6AlXj0+MhlOg19prCD1ujXA== X-Received: by 2002:a54:411a:0:b0:3a0:41d4:b144 with SMTP id l26-20020a54411a000000b003a041d4b144mr14256818oic.1.1698783959065; Tue, 31 Oct 2023 13:25:59 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-239.b2b2c.ca. [72.10.128.239]) by smtp.gmail.com with ESMTPSA id z6-20020ae9c106000000b00774350813ccsm806463qki.118.2023.10.31.13.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 13:25:58 -0700 (PDT) From: Maxim Cournoyer To: 66475@debbugs.gnu.org Subject: [PATCH v2 1/4] git-download: Add support for Git Large File Storage (LFS). Date: Tue, 31 Oct 2023 16:25:14 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66475 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/build/git.scm (git-fetch) [lfs?]: New argument, doc and setup code. (git-fetch-with-fallback) [lfs?]: New argument. Pass it to git-fetch. * guix/git-download.scm (git-lfs-package): New procedure. (git-fetch/in-band*): New procedure, made of the logic of git-fetch/in-band, with new git-lfs specifics, with the following changes: New #:git-lfs argument. : Remove labels. Conditionally add git-lfs. : Read "git lfs?" environment variable and pass its value to the #:lfs? argument of git-fetch-with-fallback. Use INPUTS directly; update comment. derivation>: Add "git lfs?" to #:env-vars. (git-fetch/in-band): Express in terms of git-fetch/in-band*. (git-fetch/lfs): New procedure. * doc/guix.texi (origin Reference): Document it. Change-Id: I5b233b8642a7bdb8737b9d9b740e7254a89ccb25 --- Changes in v2: - Do not add lfs? to ; instead add a git-fetch/lfs procedure. doc/guix.texi | 7 ++++ guix/build/git.scm | 19 +++++++-- guix/git-download.scm | 97 ++++++++++++++++++++++++++++++------------- 3 files changed, 91 insertions(+), 32 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b90078be06..0076e27939 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8375,6 +8375,13 @@ origin Reference the file name, or a generic name if @code{#f}. @end deffn +@deffn {Procedure} git-fetch/lfs ref hash-algo hash +This is a variant of the @code{git-fetch} procedure that supports the +Git @acronym{LFS, Large File Storage} extension. This may be useful to +pull some binary test data to run the test suite of a package, for +example. +@end deffn + @deftp {Data Type} git-reference This data type represents a Git reference for @code{git-fetch} to retrieve. diff --git a/guix/build/git.scm b/guix/build/git.scm index 0ff263c81b..867cade2c4 100644 --- a/guix/build/git.scm +++ b/guix/build/git.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2016, 2019, 2023 Ludovic Courtès +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,10 +34,13 @@ (define-module (guix build git) ;;; Code: (define* (git-fetch url commit directory - #:key (git-command "git") recursive?) + #:key (git-command "git") + lfs? recursive?) "Fetch COMMIT from URL into DIRECTORY. COMMIT must be a valid Git commit -identifier. When RECURSIVE? is true, all the sub-modules of URL are fetched, -recursively. Return #t on success, #f otherwise." +identifier. When LFS? is true, configure Git to also fetch Large File +Storage (LFS) files; it assumes that the @code{git-lfs} extension is available +in the environment. When RECURSIVE? is true, all the sub-modules of URL are +fetched, recursively. Return #t on success, #f otherwise." ;; Disable TLS certificate verification. The hash of the checkout is known ;; in advance anyway. @@ -57,6 +61,11 @@ (define* (git-fetch url commit directory (with-directory-excursion directory (invoke git-command "init" "--initial-branch=main") (invoke git-command "remote" "add" "origin" url) + + (when lfs? + (setenv "HOME" "/tmp") + (invoke git-command "lfs" "install")) + (if (zero? (system* git-command "fetch" "--depth" "1" "origin" commit)) (invoke git-command "checkout" "FETCH_HEAD") (begin @@ -81,11 +90,13 @@ (define* (git-fetch url commit directory (define* (git-fetch-with-fallback url commit directory - #:key (git-command "git") recursive?) + #:key (git-command "git") + lfs? recursive?) "Like 'git-fetch', fetch COMMIT from URL into DIRECTORY, but fall back to alternative methods when fetching from URL fails: attempt to download a nar, and if that also fails, download from the Software Heritage archive." (or (git-fetch url commit directory + #:lfs? lfs? #:recursive? recursive? #:git-command git-command) (download-nar directory) diff --git a/guix/git-download.scm b/guix/git-download.scm index 5d5d73dc6b..3de6ae970d 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2023 Simon Tournier +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ (define-module (guix git-download) git-reference-recursive? git-fetch + git-fetch/lfs git-version git-file-name git-predicate)) @@ -79,30 +81,36 @@ (define (git-package) (let ((distro (resolve-interface '(gnu packages version-control)))) (module-ref distro 'git-minimal))) -(define* (git-fetch/in-band ref hash-algo hash - #:optional name - #:key (system (%current-system)) - (guile (default-guile)) - (git (git-package))) - "Return a fixed-output derivation that performs a Git checkout of REF, using -GIT and GUILE (thus, said derivation depends on GIT and GUILE). +(define (git-lfs-package) + "Return the default 'git-lfs' package." + (let ((distro (resolve-interface '(gnu packages version-control)))) + (module-ref distro 'git-lfs))) -This method is deprecated in favor of the \"builtin:git-download\" builder. -It will be removed when versions of guix-daemon implementing -\"builtin:git-download\" will be sufficiently widespread." +(define* (git-fetch/in-band* ref hash-algo hash + #:optional name + #:key (system (%current-system)) + (guile (default-guile)) + (git (git-package)) + git-lfs) + "Shared implementation code for git-fetch/in-band & friends. Refer to their +respective documentation." (define inputs - `(("git" ,(or git (git-package))) - - ;; When doing 'git clone --recursive', we need sed, grep, etc. to be - ;; available so that 'git submodule' works. + `(,(or git (git-package)) + ,@(if git-lfs + (list git-lfs) + '()) ,@(if (git-reference-recursive? ref) - (standard-packages) + ;; TODO: remove (standard-packages) after + ;; 48e528a26f9c019eeaccf5e3de3126aa02c98d3b is merged into master; + ;; currently when doing 'git clone --recursive', we need sed, grep, + ;; etc. to be available so that 'git submodule' works. + (map second (standard-packages)) ;; The 'swh-download' procedure requires tar and gzip. - `(("gzip" ,(module-ref (resolve-interface '(gnu packages compression)) - 'gzip)) - ("tar" ,(module-ref (resolve-interface '(gnu packages base)) - 'tar)))))) + (list (module-ref (resolve-interface '(gnu packages compression)) + 'gzip) + (module-ref (resolve-interface '(gnu packages base)) + 'tar))))) (define guile-json (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4)) @@ -126,7 +134,7 @@ (define* (git-fetch/in-band ref hash-algo hash (define build (with-imported-modules modules - (with-extensions (list guile-json gnutls ;for (guix swh) + (with-extensions (list guile-json gnutls ;for (guix swh) guile-lzlib) #~(begin (use-modules (guix build git) @@ -134,6 +142,9 @@ (define* (git-fetch/in-band ref hash-algo hash #:select (set-path-environment-variable)) (ice-9 match)) + (define lfs? + (call-with-input-string (getenv "git lfs?") read)) + (define recursive? (call-with-input-string (getenv "git recursive?") read)) @@ -144,18 +155,17 @@ (define* (git-fetch/in-band ref hash-algo hash #+(file-append glibc-locales "/lib/locale")) (setlocale LC_ALL "en_US.utf8") - ;; The 'git submodule' commands expects Coreutils, sed, - ;; grep, etc. to be in $PATH. - (set-path-environment-variable "PATH" '("bin") - (match '#+inputs - (((names dirs outputs ...) ...) - dirs))) + ;; The 'git submodule' commands expects Coreutils, sed, grep, + ;; etc. to be in $PATH. This also ensures that git extensions are + ;; found. + (set-path-environment-variable "PATH" '("bin") '#+inputs) (setvbuf (current-output-port) 'line) (setvbuf (current-error-port) 'line) (git-fetch-with-fallback (getenv "git url") (getenv "git commit") #$output + #:lfs? lfs? #:recursive? recursive? #:git-command "git"))))) @@ -175,18 +185,49 @@ (define* (git-fetch/in-band ref hash-algo hash (git-reference-url ref)))) ("git commit" . ,(git-reference-commit ref)) ("git recursive?" . ,(object->string - (git-reference-recursive? ref)))) + (git-reference-recursive? ref))) + ("git lfs?" . ,(if git-lfs "#t" "#f"))) #:leaked-env-vars '("http_proxy" "https_proxy" "LC_ALL" "LC_MESSAGES" "LANG" "COLUMNS") #:system system - #:local-build? #t ;don't offload repo cloning + #:local-build? #t ;don't offload repo cloning #:hash-algo hash-algo #:hash hash #:recursive? #t #:guile-for-build guile))) +(define* (git-fetch/in-band ref hash-algo hash + #:optional name + #:key (system (%current-system)) + (guile (default-guile)) + (git (git-package))) + "Return a fixed-output derivation that performs a Git checkout of REF, using +GIT and GUILE (thus, said derivation depends on GIT and GUILE). + +This method is deprecated in favor of the \"builtin:git-download\" builder. +It will be removed when versions of guix-daemon implementing +\"builtin:git-download\" will be sufficiently widespread." + (git-fetch/in-band* ref hash-algo hash name + #:system system + #:guile guile + #:git git)) + +(define* (git-fetch/lfs ref hash-algo hash + #:optional name + #:key (system (%current-system)) + (guile (default-guile)) + (git (git-package)) + (git-lfs (git-lfs-package))) + "Like git-fetch/in-band, but with support for the Git Large File +Storage (LFS) extension." + (git-fetch/in-band* ref hash-algo hash name + #:system system + #:guile guile + #:git git + #:git-lfs git-lfs)) + (define* (git-fetch/built-in ref hash-algo hash #:optional name #:key (system (%current-system))) base-commit: d96a9c7473a6d07747f59eeda7d4085173c25383 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 31 16:26:47 2023 Received: (at 66475) by debbugs.gnu.org; 31 Oct 2023 20:26:47 +0000 Received: from localhost ([127.0.0.1]:49310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvK2-0007Io-PM for submit@debbugs.gnu.org; Tue, 31 Oct 2023 16:26:47 -0400 Received: from mail-oi1-x233.google.com ([2607:f8b0:4864:20::233]:59621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvK0-0007IP-H9 for 66475@debbugs.gnu.org; Tue, 31 Oct 2023 16:26:46 -0400 Received: by mail-oi1-x233.google.com with SMTP id 5614622812f47-3b2f507c03cso3302623b6e.2 for <66475@debbugs.gnu.org>; Tue, 31 Oct 2023 13:26:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698783965; x=1699388765; 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=UAmlkbPE+h3c3TheBAiZfFjz2k+6dpnlkvxAMuUjzGE=; b=jY+QaF88+tk0tWIIiCXIE3/4a9mGXTDSqGlp1JgQb7DSJ1n2+3rnuLmq0avk1a6J5A eHRckLaYc5QZ09w2oZIjudnUL4HTWzhjTiFwkktpIAm+SLNbtbrYyFSY+S31QGy1bNnW cDMA4Zlf14AECWPiZ+1mwx92NnCuHLKCimJWjiStgFJOUjSiNDTIKmiORsouFzQ0+GNa Ld7CI1frHfVaJQjDwfPXfPAqoF5kDl1AGOw4LtsyzvA35Kqw7+H1gW2BmkBCBRX72hom Wx60lKfLsdFQ3VATKRSUBXrg3HvrTykJh1ZK2atYzWX6Vti5nNyr5fNUh1o7evvZjvQV Xivw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698783965; x=1699388765; 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=UAmlkbPE+h3c3TheBAiZfFjz2k+6dpnlkvxAMuUjzGE=; b=tDr9I7QpHbuPiIHcFGgvORPKucUwO2WzX7pZLkHnfVOI7nHu24xYgf64S4Pi3ijVop XD8f1Z956Pse/oLHgvqVkmupMwr5t88mx3mElI+sZ6GBR3C7S9ZXKISfplwN42r10GvU XitF4sEepqmKjNDFGyWlUDvSezXOkxLVhKduEqLV2DRLEL7fPMaVSg0+46NWc0vAFw6A BNpvAlHM5OREjKDt5WcmQnCPaxaKNPJVW44QG5VkIVx2kew+3s64/Rtjl2d4iP3MrSvS iUQWq/A16WvTScUuT4SK9Xlz0vnzqAMuzYNQ67po4du7e+LrvAqiIHzqnwkA1kbrODL0 LOTA== X-Gm-Message-State: AOJu0YzP/f/qiwIP5Q2eUA8/bA8MuMn02gkb+76Ibm/L08ERNvukXUZr /w0V5eyEIKz3/eM5SeB7nCbK2FtPhJPpFw== X-Google-Smtp-Source: AGHT+IE0z7e3YQd64CFBgXRYlYuidNneYCMuscj+/GM92ss2p4LrNfGLBjrzlga2uruC5+rVwiVWsw== X-Received: by 2002:a05:6808:10c4:b0:3a7:1e98:80ad with SMTP id s4-20020a05680810c400b003a71e9880admr17894430ois.9.1698783964907; Tue, 31 Oct 2023 13:26:04 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-239.b2b2c.ca. [72.10.128.239]) by smtp.gmail.com with ESMTPSA id z6-20020ae9c106000000b00774350813ccsm806463qki.118.2023.10.31.13.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 13:26:04 -0700 (PDT) From: Maxim Cournoyer To: 66475@debbugs.gnu.org Subject: [PATCH v2 2/4] gnu: mdds: Update to 2.1.1. Date: Tue, 31 Oct 2023 16:25:15 -0400 Message-ID: <058de06b044c549d06571bc3d1fcd97b175e5532.1698783917.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66475 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/boost.scm (mdds): Update to 2.1.1. [source]: Fetch from git. [native-inputs]: New field. Change-Id: I4e71d5c360f4b7305cffd7008e2bbbfcaad2f897 --- (no changes since v1) gnu/packages/boost.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 98dccf7f16..71999709ed 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018, 2019, 2021 Ricardo Wurmus -;;; Copyright © 2018, 2020 Maxim Cournoyer +;;; Copyright © 2018, 2020, 2023 Maxim Cournoyer ;;; Copyright © 2018, 2020 Efraim Flashner ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019, 2020 Giacomo Leidi @@ -44,6 +44,7 @@ (define-module (gnu packages boost) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages icu4c) #:use-module (gnu packages llvm) @@ -445,15 +446,18 @@ (define-public boost-mpi (define-public mdds (package (name "mdds") - (version "2.0.3") + (version "2.1.1") (source (origin - (method url-fetch) - (uri (string-append "https://kohei.us/files/mdds/src/mdds-" - version ".tar.xz")) - (sha256 - (base32 - "1r68kxqppmhfg0dhz54d0hqzs5882cqrv1x6wpg7lak6gyyws0bc")))) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mdds/mdds") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0866020brc1kmiryh7dmhjamnywlsd56ks649hy87283k0p7d3bb")))) (build-system gnu-build-system) + (native-inputs (list autoconf automake)) (propagated-inputs (list boost)) ; inclusion of header files (home-page "https://gitlab.com/mdds/mdds") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 31 16:26:51 2023 Received: (at 66475) by debbugs.gnu.org; 31 Oct 2023 20:26:51 +0000 Received: from localhost ([127.0.0.1]:49313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvK7-0007J6-7T for submit@debbugs.gnu.org; Tue, 31 Oct 2023 16:26:51 -0400 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]:54726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvK4-0007If-RT for 66475@debbugs.gnu.org; Tue, 31 Oct 2023 16:26:49 -0400 Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-77896da2118so405042385a.1 for <66475@debbugs.gnu.org>; Tue, 31 Oct 2023 13:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698783969; x=1699388769; 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=YMYREbY6V3A16iz1O/pW7QN7SPT3Sa8Gjmg5U2MVTxw=; b=NxhsoRP91CUhDEgo/VkoibRJecpjjiH2QGFBe9ve09pigcyYkWqBMbxdKk5ev9inNC YgF+xDAqlxGBUDpMJuNWWm9mzmRswpY/wZOlxb+iklBZHRvdkQ2te62FSrKNQpQAJ2aM XhjjEVftLymjqMEMZRM0KUiENMDfUcbyvNu72wXZ1x/4aFBtHMZfnOUR+h+RXkxj1qah cKjFe8tZ6JHRAXOhgJbhg1r4OE4tvgsSAfvhvSMVx7d4oTsYPyHIHrYlS2A5ILV2GMR8 zztqq9L92s3EwyzHDRd4FxePSK+lDMYVgCwEl1KC2K4t7x0UWEXwG858Z4KjXI3PSRp9 lCYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698783969; x=1699388769; 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=YMYREbY6V3A16iz1O/pW7QN7SPT3Sa8Gjmg5U2MVTxw=; b=Z65sxrIThLPtsFuJ4hIrogX2L+eOdDbUvf24XHxqNKMJOMv6N8SxSC+k2GWvWGbbiQ 0yQk3AI2bplZXOyUy5QhJvYOy/gTFTMvF6fdZ3N6heYPDr9jtraoMusk3xi3k7JJFuLR vsLmwrWTzUcpT4pcAF5u1Y0Hyp20khN67qfjLiHsTLna4ewc73nbjibQHPEP9lnrILM+ aH+unHjpgtVnhe+I4AYtsOgRo3wg93tuFeh7PLSdCHwCTCLcxSixb7kLoihrQSjv4Mqf CdxuBHXfV5RoPRliKycPrFinNe1BXc+KY7AUufK2zw/xFtTWHUPMQeasuJ9thR6ftaIN zCWA== X-Gm-Message-State: AOJu0Yy/QYEGfQaOq6BaGrleAd6RsccsZq2kojIv5YktWRlLCB5UKYPy uRTJLcF+QfyFiw6MYxd9JAC219np3U0OQQ== X-Google-Smtp-Source: AGHT+IEwLDwxp1shmoBvh+HjhJYbO0Hdi+mErpgzakmXbQNI6BIcohWiPd3mEX5jLZEPOoV+NsP77g== X-Received: by 2002:a05:620a:2a04:b0:778:9888:c750 with SMTP id o4-20020a05620a2a0400b007789888c750mr16383963qkp.11.1698783968989; Tue, 31 Oct 2023 13:26:08 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-239.b2b2c.ca. [72.10.128.239]) by smtp.gmail.com with ESMTPSA id z6-20020ae9c106000000b00774350813ccsm806463qki.118.2023.10.31.13.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 13:26:08 -0700 (PDT) From: Maxim Cournoyer To: 66475@debbugs.gnu.org Subject: [PATCH v2 3/4] gnu: ixion: Update to 0.19.0. Date: Tue, 31 Oct 2023 16:25:16 -0400 Message-ID: <0988de7c26094f29e1dc25d3ddc6493f2d56f19e.1698783917.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66475 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/libreoffice.scm (ixion): Update to 0.19.0. [source]: Use git. [native-inputs]: Add autoconf, automake and libtool. Change-Id: I245457d7c99b6adfb895dc46276f8008ff13d0cd --- (no changes since v1) gnu/packages/libreoffice.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 71131ca1f3..e38095fb1e 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,20 +93,19 @@ (define-module (gnu packages libreoffice) (define-public ixion (package (name "ixion") - (version "0.17.0") - (source - (origin - (method url-fetch) - (uri (string-append "http://kohei.us/files/ixion/src/libixion-" - version ".tar.xz")) - (sha256 - (base32 - "07hhqkvns4da8xv990gr1smqz1zf40m531lg95nphfrz48wp3jak")))) + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/ixion/ixion") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nycbs3765wkaw9ff7aflm56ayxkn15dlfl5pbbb9b5i2rcv3dq6")))) (build-system gnu-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list mdds python spdlog)) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list mdds python spdlog)) (home-page "https://gitlab.com/ixion/ixion") (synopsis "General purpose formula parser and interpreter") (description "Ixion is a library for calculating the results of formula -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 31 16:26:56 2023 Received: (at 66475) by debbugs.gnu.org; 31 Oct 2023 20:26:56 +0000 Received: from localhost ([127.0.0.1]:49317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvKB-0007JL-QQ for submit@debbugs.gnu.org; Tue, 31 Oct 2023 16:26:56 -0400 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]:43453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvK8-0007Iw-Kh for 66475@debbugs.gnu.org; Tue, 31 Oct 2023 16:26:53 -0400 Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-77063481352so17137785a.1 for <66475@debbugs.gnu.org>; Tue, 31 Oct 2023 13:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698783973; x=1699388773; 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=0OxGvsAHggMlhxVwXyT66zdNV+NATQkSlMFw1pwEyLk=; b=Sjgj/3KNbVDFQYLRQhsewfJyYz/cNnJsdLusQVHdrBtGtpNSAZSXcS0Tpf54i4IDSt I4U0768ETTfx+r2NB6J2UK2FLrQa+OJhgewBtjprZfxEXtC9SPqyrUpqpNm2fFLh6AcQ LKihKrk1DZ4NKvNEJaORJGJY4LP0TT576rORej3WuDzJcaivjNjed4SG47GhuD4tD6du OVUPVgMCUUdFI9LS22ms6t9ziovukBGxZnme6IpIFopA1cUprDgLhXFeQVSJX3tr/IY1 kLQeWZR7eDqc0W2m175lhY8NBQsy12OVB7ZCfnqrU4wkbn4WYCbKuuWS6sj+RkxIYiWF v17w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698783973; x=1699388773; 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=0OxGvsAHggMlhxVwXyT66zdNV+NATQkSlMFw1pwEyLk=; b=uwHM94vpdy97pxpY7uXltY/5q6nuDdfe9wskPNvCLK8R6EGE260+w48Kl18BAmD5ax G8khM/RylqMO8GU9xxIpohhfAk7SY4PxKcSMixr+TP0T+5evHfkK0EG54pjCPkL7RZjx GZJhLy0ZQF7XbIxAFUISWcB33SU1OPIlDpr1EudnpVqGBvWmdAB7dEYXqUSVJYH6KMkY uClShTCUkJsQ4UoB/110kMUKeYOxiOwtylgNgddNGvFE4U5yWzwoE3DC+HmVQXiLcJvl xihkz4/jTd3++wnUcKwRQ7OEGgXPlZRQ/mXFF/CJCLJbagXx+eGFJoh036/1u4jCzIix EOCA== X-Gm-Message-State: AOJu0YwFd/+GAWcqAiHV8BqAwMrddAPNB80hvBRv0MVB2jt34yZPncYp 6H8E+TGDP9BE504+8sejaPZgjqoxHswdZw== X-Google-Smtp-Source: AGHT+IGyHAEK5XN9/E3SeLUnU8VuXgRmlsiM23QaBwPzHkDJpgGi0qSYzOMaJiHHCO9xsSoALZp5uQ== X-Received: by 2002:a05:620a:1a04:b0:773:fa62:39fe with SMTP id bk4-20020a05620a1a0400b00773fa6239femr1017284qkb.1.1698783973005; Tue, 31 Oct 2023 13:26:13 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-239.b2b2c.ca. [72.10.128.239]) by smtp.gmail.com with ESMTPSA id z6-20020ae9c106000000b00774350813ccsm806463qki.118.2023.10.31.13.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 13:26:12 -0700 (PDT) From: Maxim Cournoyer To: 66475@debbugs.gnu.org Subject: [PATCH v2 4/4] gnu: orcus: Update to 0.19.0. Date: Tue, 31 Oct 2023 16:25:17 -0400 Message-ID: <59a3d5e428c780a7d863cd5e53b64addc5122169.1698783917.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66475 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/libreoffice.scm (orcus): Update to 0.19.0. [source]: Use git-fetch/lfs. [arguments]: Use gexps. [native-inputs]: Add autoconf, automake and libtool. Change-Id: I76efbc57ca4acf8ffd5154a72e49b4aedd071a76 --- (no changes since v1) gnu/packages/libreoffice.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index e38095fb1e..572077a0ee 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -117,22 +117,22 @@ (define-public ixion (define-public orcus (package (name "orcus") - (version "0.17.2") - (source - (origin - (method url-fetch) - (uri (string-append "http://kohei.us/files/orcus/src/lib" - "orcus-" version ".tar.xz")) - (sha256 - (base32 - "1as04qb74jnlnwy4wh5jwaw2nnzgn2s3230ymvh3kx1w9r0rsl1h")))) + (version "0.19.0") + (source (origin + ;; The test suite requires data files store with Git Large + ;; File Storage. + (method git-fetch/lfs) + (uri (git-reference + (url "https://gitlab.com/orcus/orcus") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02prj6kgph56fkr89k8wlqarrmx65cq92863i4rrny5sqr8c2llr")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags '("--disable-static"))) - (native-inputs - (list pkg-config)) - (inputs - (list ixion mdds python zlib)) + (arguments (list #:configure-flags #~(list "--disable-static"))) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list ixion mdds python zlib)) (home-page "https://gitlab.com/orcus/orcus") (synopsis "File import filter library for spreadsheet documents") (description "Orcus is a library that provides a collection of standalone -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 31 16:30:53 2023 Received: (at 66475) by debbugs.gnu.org; 31 Oct 2023 20:30:53 +0000 Received: from localhost ([127.0.0.1]:49334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvO1-0001KW-4S for submit@debbugs.gnu.org; Tue, 31 Oct 2023 16:30:53 -0400 Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]:54301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxvNy-00012G-IA for 66475@debbugs.gnu.org; Tue, 31 Oct 2023 16:30:51 -0400 Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6cd0963c61cso3528591a34.0 for <66475@debbugs.gnu.org>; Tue, 31 Oct 2023 13:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698784211; x=1699389011; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sGEiTLQqzJLYDl9fBFDJg3N2B+OdYudCdI1NBTjJIBU=; b=Jvocq7L2MNShBXJibxyMjOIc3GZv5nHH/jaXjKikoPhjN71DoHhVlc6VviIjpjvELm OmR8C+W+JeULEYBhz+XUUtIGRU0ytnWSWbNrZgy0+cj1Hd+wnqbo5uo8HckYbDL/bfht TTjKwxaUTm//IyaEIFbRErHTRHtbh4So9bCUpUKA4qdgQfOB38DdUNsUV9CMHoMaud+z aGcujLyAcEt7teWSB0meQK5TU+4Ypub0wat7mpV+DkFWMm5cB7WDFrADykubjPF+dvkM e7Hlc+BZsJnI89FWeTJEEu3mvHBthHABSUM5Q65OpXIkM6IEo7hSiqMrRQ8x9+boAvTJ +X2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698784211; x=1699389011; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sGEiTLQqzJLYDl9fBFDJg3N2B+OdYudCdI1NBTjJIBU=; b=wrGNOiMHEl2jhmmE3JBxno9+yp5CXF62R6aFaGssvR9tUsrsqtVXRUqteXyxa8jZ+f IIf36GBnbZpXqi64DzKsAe7wgvqJiPJHW+IlzLzgPpCg1xNzae6hngNWQa6Xf+46qxbM EQY8eONkYqYokOvpiUR6/KA9nWNbWIyXvNnUS18q7LFWOUjE5zDcp+1AM/Prh3q4x/pv GSMG3U2w5VajzmuSUURpzUE+bm9NHpUSDwBRAQU+85HkzhUR3XVoL8Q9Bg+Ca/jXtg1w 5/OhdSoKTESvnMQwYR0Fd4dFmYGby+LdCNEN4irZEprThIespmiEmakzx7Sk6OJeypOv Vthw== X-Gm-Message-State: AOJu0Yw5dsiNt8V3Too201+a951ViLcebRLZB9zCYY2jfbQo0/cyVKn9 rdkyS3zJtBxufKSbleDhTWU= X-Google-Smtp-Source: AGHT+IHgayixmyV+bszgI2ftxRLX9xPIo7qNRWihTQo7NxKXA7ypzbVUfdkiQTohOUXb9WQq335jqw== X-Received: by 2002:a9d:7499:0:b0:6bc:8afe:8a15 with SMTP id t25-20020a9d7499000000b006bc8afe8a15mr12888501otk.38.1698784210825; Tue, 31 Oct 2023 13:30:10 -0700 (PDT) Received: from hurd (dsl-10-128-239.b2b2c.ca. [72.10.128.239]) by smtp.gmail.com with ESMTPSA id x25-20020ac84d59000000b00419c40a0d70sm796122qtv.54.2023.10.31.13.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 13:30:09 -0700 (PDT) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= , Simon Tournier Subject: Re: [bug#66475 (was 66436)] [PATCH 2/2] git-download: Add support for Git Large File Storage (LFS). In-Reply-To: <87fs2awn6r.fsf@gmail.com> (Maxim Cournoyer's message of "Mon, 16 Oct 2023 12:23:56 -0400") References: <58269ccea06b016c38d3bea8678608c8cccce1ca.1697078865.git.maxim.cournoyer@gmail.com> <877cnpdt6d.fsf@gnu.org> <87fs2ar42s.fsf@gmail.com> <87fs2awn6r.fsf@gmail.com> Date: Tue, 31 Oct 2023 16:30:07 -0400 Message-ID: <874ji6pmb4.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66475 Cc: Josselin Poiret , Mathieu Othacehe , Tobias Geerinckx-Rice , 66475@debbugs.gnu.org, Ricardo Wurmus , Christopher Baines X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Maxim Cournoyer writes: > Hi, > > Simon Tournier writes: > >> Hi, >> >> I reorder Ludo=E2=80=99s answers for clarity. >> >> On Sat, 14 Oct 2023 at 19:12, Ludovic Court=C3=A8s wrote: >> >>> Also, it is crucial for the =E2=80=9Cbuiltin:git-download=E2=80=9D sema= ntics to be the >>> same across all installations and to be very stable. >> >> I agree and that=E2=80=99s one strong argument for me. >> >>> Overall, I feel like LFS support, if needed, should be =E2=80=9Con the = side=E2=80=9D, >>> with a custom =E2=80=98git-fetch/lfs=E2=80=99 or something along these = lines (just like >>> we have =E2=80=98url-fetch/tarbomb=E2=80=99). >> >> I agree with this direction. Most of the fetching methods should not be >> implemented with =E2=80=9Cbuiltin=E2=80=9C but the converse, git-fetch/l= fs. >> >> ( Even, I think the current git-fetch using out-of-band builtin >> recently introduced should be a =E2=80=99git-fetch/bootstrap=E2=80=99 me= thod, and >> git-fetch using in-band should be the default method. ) > > Thanks for tipping in, I'll look into adding a whole new 'git-fetch/lfs' > procedure. Done, see v2. The 'orcus' package makes use of it -- its test suite is broken without it. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 05 09:49:53 2023 Received: (at 66475) by debbugs.gnu.org; 5 Nov 2023 14:49:53 +0000 Received: from localhost ([127.0.0.1]:36411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzeRk-000585-PD for submit@debbugs.gnu.org; Sun, 05 Nov 2023 09:49:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzeRj-00057r-2v for 66475@debbugs.gnu.org; Sun, 05 Nov 2023 09:49:51 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzeR2-0004WZ-9l; Sun, 05 Nov 2023 09:49:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=jqXnEfJpN9iQXxgxGNh3/C07uZPO3sdYWEQy5Lxns/c=; b=ahXAEWxiBXd3HZkD5YbS iUoBDA6yaTuXPdby3y5b1R9cm1VKjzyDMuqZ8uDkCf7NWR0cBjgzCdxc+Kb1cuOOjQcaHsFh6mPEN DqCklC6Jzm6i/3xHIBJZuRO9BukMRCr59VVIuQaIj+nSEjBvBwoOKu0QFAskUSaX/IOVaX4R8W3al SU9slNNdVzGr/AIbzog/T93cJ5V3fD32cX2AIDRTV4Mk53Kdg9TuAhpIQoeowiYRo+GW69SFiVE/o h9E0QWR7pN9W3wcSfdE2nqLbGAyPVCdsd4T6gHL1Gxni9qO8PeAXanmsKTNCvpU9/eP2KJBsC+v47 eK+ljipbQXnqcg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: [bug#66475] [PATCH v2 1/4] git-download: Add support for Git Large File Storage (LFS). In-Reply-To: (Maxim Cournoyer's message of "Tue, 31 Oct 2023 16:25:14 -0400") References: X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quintidi 15 Brumaire an 232 de la =?utf-8?Q?R=C3=A9v?= =?utf-8?Q?olution=2C?= jour du Dindon X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 05 Nov 2023 15:49:03 +0100 Message-ID: <87jzqw1cio.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66475 Cc: Josselin Poiret , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , 66475@debbugs.gnu.org, Ricardo Wurmus , Christopher Baines X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Maxim, Maxim Cournoyer skribis: > * guix/build/git.scm (git-fetch) [lfs?]: New argument, doc and setup code. > (git-fetch-with-fallback) [lfs?]: New argument. Pass it to git-fetch. > * guix/git-download.scm (git-lfs-package): New procedure. > (git-fetch/in-band*): New procedure, made of the logic of git-fetch/in-ba= nd, > with new git-lfs specifics, with the following changes: > New #:git-lfs argument. > : Remove labels. Conditionally add git-lfs. > : Read "git lfs?" environment > variable and pass its value to the #:lfs? argument of git-fetch-with-fall= back. > Use INPUTS directly; update comment. > derivation>: Add "git lfs?" to #:env-vars. > (git-fetch/in-band): Express in terms of git-fetch/in-band*. > (git-fetch/lfs): New procedure. > * doc/guix.texi (origin Reference): Document it. > > Change-Id: I5b233b8642a7bdb8737b9d9b740e7254a89ccb25 > --- > > Changes in v2: > - Do not add lfs? to ; instead add a git-fetch/lfs proced= ure. I haven=E2=80=99t tested it but it looks great to me, thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 07 11:18:37 2023 Received: (at 66475-done) by debbugs.gnu.org; 7 Nov 2023 16:18:37 +0000 Received: from localhost ([127.0.0.1]:43091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Omj-0003RG-GY for submit@debbugs.gnu.org; Tue, 07 Nov 2023 11:18:37 -0500 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:51474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Omh-0003R1-S7 for 66475-done@debbugs.gnu.org; Tue, 07 Nov 2023 11:18:36 -0500 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-77891c236fcso409543485a.3 for <66475-done@debbugs.gnu.org>; Tue, 07 Nov 2023 08:17:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699373872; x=1699978672; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PpcLd2JkAbT8iRSZ+9EjVLe6XWCu3T2ftB880KMiRlk=; b=N3phjwIgWeuHc/Z/qSahZRNqEURiaCfVMjfwDYaq4IwkyfoIfy9yWYd7SWBuSa4Xff 1zveDCUEK5IWGsvWn5F0A6J6ktB8GpKM4D6mlnVVGFIyE7e3U01vDPSOrszfT7Mur0o2 IUPvseuEnfK3hadeG8rgpMuxae5Lr5gmG1Ky4xFF2chrB4oCWc76kN9xhr0hB6AmtFSj 6mAu4ybgpPjvpMuLaSBC+4Yd9MfcPKpH7LkF0Rrfdxz5RnzSk5V8696W3IcHXMvD+vXi a+N42gXJ0vM/mHYQ+Lm2m1H2wQf5WcCein5Laa1rs1Bv2xw3uRL5ICFR6Y3qX9FmZaMp Y1WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699373872; x=1699978672; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PpcLd2JkAbT8iRSZ+9EjVLe6XWCu3T2ftB880KMiRlk=; b=d/i0CXB6ewpeRK56GrOAG9J1OGpvq98WXbL3lwAtBDQdSIqwXeN0occi6kZPlBSNQ6 uphJDp8lIS7gszrTVlmEJKQxz3xTLnxn8u9VGXBHSGeIn8PeXwh2utF5HK1V0cDGM1qk Ha3JI7wCLzQRVB4l+oYmjJsCutAwtxciEgHwxZ9O/EZCX2aJIqQ4a6XNFEleHrAM1R2q ITX4iS4ZrBOxdQb5cx14B70pEkHikXzfOL0rZKlJUErcUY1BQllh9FaAJPYXvMnXgv5Y Gv8b1ixqTugeeybn9UST2gUkTM40e5PSOr4PZjKyOhXsdKYpTwA87KW1pLzGDAJlO4ge 0G4g== X-Gm-Message-State: AOJu0YzfF1um3cgXoNTCPIcRJTsKq6+DA9pFdU5YE/zxScBgB5ldMJrV z3GEJkmhp2l3iOcT6+4DiAI= X-Google-Smtp-Source: AGHT+IHhcu1ANsEv4PdykQ/PbP/OR1MluMlQ4Wi8Eb8tiODtf889StpmzQvyMIFancwX2lMUyvs5xw== X-Received: by 2002:ad4:4ee5:0:b0:66f:bb58:c150 with SMTP id dv5-20020ad44ee5000000b0066fbb58c150mr41106503qvb.56.1699373872286; Tue, 07 Nov 2023 08:17:52 -0800 (PST) Received: from hurd (dsl-10-130-87.b2b2c.ca. [72.10.130.87]) by smtp.gmail.com with ESMTPSA id w1-20020a0cc701000000b006713142482fsm29283qvi.74.2023.11.07.08.17.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 08:17:51 -0800 (PST) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#66475] [PATCH v2 1/4] git-download: Add support for Git Large File Storage (LFS). In-Reply-To: <87jzqw1cio.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Sun, 05 Nov 2023 15:49:03 +0100") References: <87jzqw1cio.fsf@gnu.org> Date: Tue, 07 Nov 2023 11:17:50 -0500 Message-ID: <87a5rpk05t.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66475-done Cc: Josselin Poiret , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Ricardo Wurmus , Christopher Baines , 66475-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Ludovic Court=C3=A8s writes: > Hi Maxim, > > Maxim Cournoyer skribis: > >> * guix/build/git.scm (git-fetch) [lfs?]: New argument, doc and setup cod= e. >> (git-fetch-with-fallback) [lfs?]: New argument. Pass it to git-fetch. >> * guix/git-download.scm (git-lfs-package): New procedure. >> (git-fetch/in-band*): New procedure, made of the logic of git-fetch/in-b= and, >> with new git-lfs specifics, with the following changes: >> New #:git-lfs argument. >> : Remove labels. Conditionally add git-lfs. >> : Read "git lfs?" environment >> variable and pass its value to the #:lfs? argument of git-fetch-with-fal= lback. >> Use INPUTS directly; update comment. >> derivation>: Add "git lfs?" to #:env-vars. >> (git-fetch/in-band): Express in terms of git-fetch/in-band*. >> (git-fetch/lfs): New procedure. >> * doc/guix.texi (origin Reference): Document it. >> >> Change-Id: I5b233b8642a7bdb8737b9d9b740e7254a89ccb25 >> --- >> >> Changes in v2: >> - Do not add lfs? to ; instead add a git-fetch/lfs proce= dure. > > I haven=E2=80=99t tested it but it looks great to me, thank you! Thanks for taking the time to review it! I'll push it shortly. --=20 Thanks, Maxim From unknown Thu Jun 19 16:18:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 06 Dec 2023 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator