From patchwork Sun Feb 18 20:59:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60524 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 6C8F927BBE9; Sun, 18 Feb 2024 21:01:09 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 888FE27BBE2 for ; Sun, 18 Feb 2024 21:01:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rboHQ-0007Wx-Vs; Sun, 18 Feb 2024 16:00:57 -0500 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 1rboHJ-0007T6-8G for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:50 -0500 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 1rboHF-0004yQ-VU for guix-patches@gnu.org; Sun, 18 Feb 2024 16:00:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rboHa-0002lY-K4 for guix-patches@gnu.org; Sun, 18 Feb 2024 16:01:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH v2 10/10] gnu: ghq: Fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 21:01:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69238 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69238@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 69238-submit@debbugs.gnu.org id=B69238.170829005810540 (code B ref 69238); Sun, 18 Feb 2024 21:01:06 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 21:00:58 +0000 Received: from localhost ([127.0.0.1]:38607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHR-0002jq-LA for submit@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:58 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:59903) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rboHI-0002hl-3Z for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 16:00:52 -0500 Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-41267d9d6faso120215e9.3 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 13:00:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708289962; x=1708894762; 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=0MGqrtWOuZgh/f6TC/v9dDzvfmVs8j06Xq4kAxI+mBQ=; b=DSh+/CrOUq2L9VjA6xRBtjXKpuq079LrvAxbB9GuCy378lvlSlgqZbsg7JPCLZLb+p YURSbyQgmlHlhJDUN7FDLgzJ/YGnwTJgQI19l+2XvRYxpcBpJOXtaW4E1kZ9uwLl8yBL IwROAcxbUEaiI1B8Ri2dCd3OV2RmM/WOk4eTb2wGpG5TPiFdY1iodU4/4Y3D7jQO056W RpGbCb5/+g47Ppb5sGfOy7P7l5PS44QuXnmt3zSrhbVXRkOtFUVuFW/8/KYOlcUEDp/0 FxjWBUKDkSWhIvvuHRtNjUII+9je55wtc9SR0TcEpp22hNGDTJP53BwvyLtUPIaa/jHW B2yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708289962; x=1708894762; 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=0MGqrtWOuZgh/f6TC/v9dDzvfmVs8j06Xq4kAxI+mBQ=; b=e43wEWmVDBwC0fwLkTYPLsB/XTFeij5aCc/f8+gyOGuvaCkAKJnebiI0Sz/gBCaYAf Zrz8wnfVJX0J8e9RWrJAm20i28Ou0iTGuRbfRVdHDmsqKINGbH74uVAyLyuFuNG8Dici ojVgcywiOTkKg3qyl4EeE8qbERnhqxOWRYOr/pYVhxB/3uurWCE5jUOqOsYtI1vO532L z69cUbsNcS3Y4zyYma+n9CpjnOpfEytGCV3IsXJQYQLhsBRj7rq7JMdXIKUiKmICmpDv JwH4lC0chiwddD1HQbCuJMg1atSTBFw0fsyVzbu7ZvARZKt4fc/XX5g1CcOgk/bmqSJ9 x3oQ== X-Gm-Message-State: AOJu0YwAcTMonBrgaRyazIIw7CEj34cycOIroB8cacySi85on8VdrOua Rdh85/rJmP6Rs4HhKwMamaHLgyJo2Yia9LNIrGXpkjMy+rnYIMXTd6D8dugnUgLyjg== X-Google-Smtp-Source: AGHT+IHOc0cGSNz4qct7KpKKr5N9qFigqJX8w4GbH4fH8purpMArmvOKeyB7DIKEPOUy+licN2w/gQ== X-Received: by 2002:a05:600c:458d:b0:412:6404:45d2 with SMTP id r13-20020a05600c458d00b00412640445d2mr1205565wmo.28.1708289961767; Sun, 18 Feb 2024 12:59:21 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id ay23-20020a05600c1e1700b004125ff0b572sm4363713wmb.8.2024.02.18.12.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 12:59:21 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 20:59:09 +0000 Message-ID: <03988e68eab5fd487fccaaae2f1fae4e46e9b9c3.1708289807.git.sharlatanus@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 Fix build as seen in . * gnu/packages/version-control.scm (ghq): Use G-expressions. [arguments] <#:go>: Use go-1.21. <#:phases>: Remove trailing #t from lambda. Change-Id: Ifb1e133a2570dcd04212ef43b46c8b41c3507c88 --- gnu/packages/version-control.scm | 35 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 242c2bf093..3c43effbd1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3720,23 +3720,24 @@ (define-public ghq "155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh")))) (build-system go-build-system) (arguments - '(#:install-source? #f - #:import-path "github.com/x-motemen/ghq" - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-completions - (lambda* (#:key outputs import-path #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash-completion (string-append out "/etc/bash_completion.d")) - (zsh-completion (string-append out "/share/zsh/site-functions"))) - (with-directory-excursion (string-append "src/" import-path) - (mkdir-p bash-completion) - (copy-file "misc/bash/_ghq" - (string-append bash-completion "/ghq")) - (mkdir-p zsh-completion) - (copy-file "misc/zsh/_ghq" - (string-append zsh-completion "/_ghq")))) - #t))))) + (list + #:install-source? #f + #:go go-1.21 + #:import-path "github.com/x-motemen/ghq" + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-completions + (lambda* (#:key outputs import-path #:allow-other-keys) + (let* ((out #$output) + (bash-completion (string-append out "/etc/bash_completion.d")) + (zsh-completion (string-append out "/share/zsh/site-functions"))) + (with-directory-excursion (string-append "src/" import-path) + (mkdir-p bash-completion) + (copy-file "misc/bash/_ghq" + (string-append bash-completion "/ghq")) + (mkdir-p zsh-completion) + (copy-file "misc/zsh/_ghq" + (string-append zsh-completion "/_ghq"))))))))) (native-inputs (list git-minimal)) (inputs