From patchwork Sun Feb 18 18:40:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60520 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 EF64827BBE2; Sun, 18 Feb 2024 18:42:43 +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=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1148D27BBEA for ; Sun, 18 Feb 2024 18:42:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbm6m-00082j-GS; Sun, 18 Feb 2024 13:41:48 -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 1rbm6k-00082H-O1 for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:46 -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 1rbm6k-0006wW-Fz for guix-patches@gnu.org; Sun, 18 Feb 2024 13:41:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbm75-0004Ws-2R for guix-patches@gnu.org; Sun, 18 Feb 2024 13:42:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69238] [PATCH 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 18:42:07 +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.170828170317295 (code B ref 69238); Sun, 18 Feb 2024 18:42:07 +0000 Received: (at 69238) by debbugs.gnu.org; 18 Feb 2024 18:41:43 +0000 Received: from localhost ([127.0.0.1]:38220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6h-0004Un-57 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:43 -0500 Received: from mail-wr1-f43.google.com ([209.85.221.43]:50484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbm6a-0004ST-2R for 69238@debbugs.gnu.org; Sun, 18 Feb 2024 13:41:36 -0500 Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-33d01faf711so2110540f8f.1 for <69238@debbugs.gnu.org>; Sun, 18 Feb 2024 10:41:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708281610; x=1708886410; 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=Bm+6QrHO2o53VIybfLDbZhz1+emRr1u5AZMZs+zQlsw=; b=V/WbrrpLNOKmLl7Uo2Hap+jH2lnX/rkdkqQmmLWRri+p9Qx5eYmKTd+EodXMW3cVHK 1HrzR+4mbFRduBCPl85mVQA0zVAnRawWY/YiLgY04r8q6MLgv0cnz3jTex2HvXWRftnP frqEC8znu/IIUJlNGWyBIjIznCIG1QEW+XocsR2umcrLmPcOuQEQnuFJRn+X3kNGz2oa E9XyY5GZXV6hasSPO4Cco/FZaUZt4AWhQFmxOSXMf6HBl7GBCwqZR9OUiYaZddm2Go6P VEI+hPelZFFrUshPCdZeh6JMTJO9T28IvyvhrCZ6/orNq5dRQHt+pJ5qdZPcgmch/yed Dtow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708281610; x=1708886410; 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=Bm+6QrHO2o53VIybfLDbZhz1+emRr1u5AZMZs+zQlsw=; b=pwVU+qq0MLlhBk9A6xPcjsvz7IGPTOhjSM2tBVwD/vxmB9ksWLmjSpf7f9chhDGxaG jlPETtAPAxYDidOh4He46GIu7iT/YtfkUYVzzJYKDSDa0EO45LWlcgF8HHCBNnouBqBR LRO715zNxP7GEwjLp9k+CY0DBDnKHu8gqbawl14jVR8Chtn+o3tQMROU0ldspW7wffZW mjWxHCVrD6hL0UGmB2VtRHRBtORGqvN6fbl4y23c36LUofYJS9au05SnwyU6IhV7pLTh vH6widajMLgGJRJxSBSLxqsNM8dBJbBt92CWjk2eyhI7a+Jd6Feuq9DynuCxoc7zpsfw pYxg== X-Gm-Message-State: AOJu0Yz6Kte8AAmpfrvOk5Qbx3OjBxshwuUQOBx8yPDMmU8c7eEb5THZ qW8Pms7ODuHPUanLOSg85jrirMdqjTV433aMR5e26fpx6P+M9NhQwTlLLWCVBLY= X-Google-Smtp-Source: AGHT+IHfSWXMBOYcvJ0fFlldSxFIpdGOAr+dhjO9irIMkXjBqfcYp4E2iI4/DIHsCGWR+ETTwnWoUA== X-Received: by 2002:adf:f9c5:0:b0:33d:14e8:70e2 with SMTP id w5-20020adff9c5000000b0033d14e870e2mr6340541wrr.53.1708281609696; Sun, 18 Feb 2024 10:40:09 -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 x11-20020a5d444b000000b0033b7ce8b496sm8011358wrr.108.2024.02.18.10.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 10:40:09 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 18 Feb 2024 18:40:01 +0000 Message-ID: <99555416c787fd6d58760a281799b0cf53ca1da6.1708155311.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 b2bcca8b1e..705a7facdc 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