From patchwork Tue Sep 10 01:27:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 67839 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 0005727BBEB; Tue, 10 Sep 2024 02:29:38 +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=-6.5 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 8802027BBE2 for ; Tue, 10 Sep 2024 02:29:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snpgm-0005UT-1u; Mon, 09 Sep 2024 21:29:04 -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 1snpgj-0005Th-KB for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:01 -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 1snpgj-0000I1-AB for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=YqqzGPB25IgJi8rnQLcbWxmikRY4ciI/jvPNMgROfUo=; b=eAn3FmEgERc1i31QBJ6xD7NfdAkofoDJTlKcWndKqodmqAisppcR4CexF3xtjeSZZqCwt7wgSMaSSR/DW5HdU6uEi+jezES8Cs+yOs7UuVfsctor2EOQFXaeojPk+BB/QvpQ0fwPmPygYkqhliEbf/UAz9lHmtHo992C0/H0Sfv7RuMorIhkWY6MERI14kWHCcF5tiJsajBH68O671+aEpxcui4yjjhgw+g8JO3EHOWf+Qxfou9IWGq2EgM4ILJ/ztoUC5PHlvZcuVPDdyT8PDh13Y5LLR70tp0xAkv3g+5YwtR/FEbL+WY6PpKSye4//KHDO6RXCbSpMMbYM451OQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snpgn-0000qm-Hs for guix-patches@gnu.org; Mon, 09 Sep 2024 21:29:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73073] [PATCH v2 8/8] gnu: cgit: Remove input labels. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 01:29:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73073@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 73073-submit@debbugs.gnu.org id=B73073.17259317313185 (code B ref 73073); Tue, 10 Sep 2024 01:29:05 +0000 Received: (at 73073) by debbugs.gnu.org; 10 Sep 2024 01:28:51 +0000 Received: from localhost ([127.0.0.1]:34450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgZ-0000pI-1D for submit@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:51 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:51582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snpgR-0000nx-L9 for 73073@debbugs.gnu.org; Mon, 09 Sep 2024 21:28:46 -0400 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-42cbe624c59so3013865e9.3 for <73073@debbugs.gnu.org>; Mon, 09 Sep 2024 18:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725931653; x=1726536453; 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=YqqzGPB25IgJi8rnQLcbWxmikRY4ciI/jvPNMgROfUo=; b=lFubBtqf6sUdU4XYhMsauaT7+gAdZEqzhueNaszDJs0fWzejzRufFKvTlZNhiZRZjd xn9iU1rI0P7KdvVyTWKBa13yU2Mu6sRgX8RC/t3anNRA2aC1eGUUXl9QwVlLag1UTacB IFkzKMGPUhf4hwLLnGh5tX9feo6AWL55FFB9+84kk2FDwa4H5xcKu9/SudPyy7ZHit4z BTe7hLaiqhz1BCYsOGtzMMekcMzoHI7bWCzv8ARY0dr415qI7kX2+uFS6mFRgAMRkXPv uGSc+9cZyYv3Ekdk4Iw1ARl+96VexhuVg/X510eFWYNmNLyktGIEJzTYkR5ri3Kqzq1p bwYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725931653; x=1726536453; 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=YqqzGPB25IgJi8rnQLcbWxmikRY4ciI/jvPNMgROfUo=; b=ZcebNrQ+E9YeNfvmCPV6h2y7pFtxa15bkVwsi4fgQA3fDKHcFzqHKi4tSlw29S5uYu CKUEINA3WYHcFZssWIZonwQB/deRqC1uUfzFX1yMSGS7wteUfFBZQUKSbt/ZRwMXUlXk VBGUW8ephIEI5KwvsVo32DTlKkwqUeBWkBlM9UeyZmAXVGaOEJkVP/0Xu2V5/vjMb3Cm +yVR+an65agtyb8n3AFifZJCDbrd1+i3Ofw7nP63X0hJXR0hTnRFiPyVruH/C6yyZyUX 8OvVojqPitz2WzNiUEMXxfEBwuSG4m7MEMkEy59NuwtIC6KiEU64PzXkueCv5qQX58mh LV7Q== X-Gm-Message-State: AOJu0Yyyj1pQFbWs7RgGe19k35twTfEVyxBp5gobsSCk27VZJMbsowNL SKJ/BDKYGwygMQgn9Hqp4wwfU3fP5c01MwAYAdZDyxSv9hJ50u2lMXeQbw== X-Google-Smtp-Source: AGHT+IGliG3Dey8J6CkZhk4eCSjtAt1HSU6bXRIH3hQObENAzejQeGaoMLfGV8sb5Zu6Z73gIM5eSA== X-Received: by 2002:a05:600c:46c6:b0:42c:b9b1:8342 with SMTP id 5b1f17b1804b1-42cb9b18468mr25972165e9.19.1725931653626; Mon, 09 Sep 2024 18:27:33 -0700 (PDT) Received: from lili.. ([2a01:e0a:59b:9120:5ac1:7013:f8b9:fc1a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb45c81sm93204255e9.28.2024.09.09.18.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:27:33 -0700 (PDT) From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:16 +0200 Message-ID: <19f279c682308ff8bf719c8073e8c3d10856e08e.1725930587.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.46.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 (cgit) [inputs]: Remove labels. [arguments]: Adjust. Change-Id: Iff479fa636f7a4c4fef5137ae22934d4e213223b --- gnu/packages/version-control.scm | 50 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a0fdcb0da9..5b28eeaa9e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1315,7 +1315,7 @@ (define-public cgit (lambda* (#:key inputs #:allow-other-keys) ;; Unpack the source of git into the 'git' directory. (invoke "tar" "--strip-components=1" "-C" "git" "-xf" - (assoc-ref inputs "git-source")))) + #$(this-package-input "git-source")))) (add-after 'unpack 'patch-absolute-file-names (lambda* (#:key inputs outputs #:allow-other-keys) (define (quoted-file-name input path) @@ -1370,29 +1370,31 @@ (define-public cgit ;; For building manpage. (list asciidoc)) (inputs - `( ;; Building cgit requires a Git source tree. - ("git-source" - ,(origin - (method url-fetch) - ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, - ;; which may not match the current (package-version git). - (uri "mirror://kernel.org/software/scm/git/git-2.46.0.tar.xz") - (sha256 - (base32 "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz")))) - ("bash-minimal" ,bash-minimal) - ("openssl" ,openssl) - ("python" ,python) - ("python-docutils" ,python-docutils) - ("python-markdown" ,python-markdown) - ("python-pygments" ,python-pygments) - ("zlib" ,zlib) - ;; bzip2, groff, gzip and xz are inputs (not native inputs) - ;; since they are actually substituted into cgit source and - ;; referenced by the built package output. - ("bzip2" ,bzip2) - ("groff" ,groff) - ("gzip" ,gzip) - ("xz" ,xz))) + (list + ;; Building cgit requires a Git source tree. + (origin + (method url-fetch) + ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, + ;; which may not match the current (package-version git). + (uri "mirror://kernel.org/software/scm/git/git-2.46.0.tar.xz") + (sha256 + (base32 "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz")) + (file-name "git-source")) + bash-minimal + openssl + python + python-docutils + python-markdown + python-pygments + zlib + ;; bzip2, groff, gzip and xz are inputs (not native inputs) + ;; since they are actually substituted into cgit source and + ;; referenced by the built package output. + + bzip2 + groff + gzip + xz)) (home-page "https://git.zx2c4.com/cgit/") (synopsis "Web frontend for git repositories") (description