From patchwork Sat Dec 2 14:21:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 57212 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 C626C27BBEA; Sat, 2 Dec 2023 14:23:10 +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, 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 0FFA727BBE2 for ; Sat, 2 Dec 2023 14:23:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9QtS-0006zm-LF; Sat, 02 Dec 2023 09:22:54 -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 1r9QtR-0006zJ-0w for guix-patches@gnu.org; Sat, 02 Dec 2023 09:22:53 -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 1r9QtQ-0007ep-Or for guix-patches@gnu.org; Sat, 02 Dec 2023 09:22:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9Qta-0000Fa-25 for guix-patches@gnu.org; Sat, 02 Dec 2023 09:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67585] [PATCH] gnu: guile-gitlab: Improve the package style. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Dec 2023 14:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67585 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67585@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1701526926893 (code B ref -1); Sat, 02 Dec 2023 14:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Dec 2023 14:22:06 +0000 Received: from localhost ([127.0.0.1]:56976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Qsg-0000EL-5j for submit@debbugs.gnu.org; Sat, 02 Dec 2023 09:22:06 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Qsd-0000Dr-PX for submit@debbugs.gnu.org; Sat, 02 Dec 2023 09:22:04 -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 1r9QsO-0006v2-Vb for guix-patches@gnu.org; Sat, 02 Dec 2023 09:21:48 -0500 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r9QsI-0007E8-4K for guix-patches@gnu.org; Sat, 02 Dec 2023 09:21:48 -0500 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2c9e9c2989dso11455891fa.0 for ; Sat, 02 Dec 2023 06:21:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701526896; x=1702131696; darn=gnu.org; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=jZnEPdvbIgtDgAWMFIOxMorVdAO86g0WLD9WvpuEjYc=; b=X8kwIBGrUu2UbEXPRGu/UmuPjfmYw/zUdB8qQjOvwUpsULP+ZfcryUPerZRNor/Cwx hZSeKvnoBj59/znK3yaI2oXo7SU6L1njHDNmDsJ5tjbZXRPUoFOOv+/8x7hSJeX3SboS Ednmm9Ucy5muypyae9yq+x2xO7zuKiAKkeT6dnS/F18nSWPVRdLbXvFMPrvxQAyXKMFy DijMmyh67xCtrAMQC0DLdewvbcaYSG2U1YffyVQnum4sJMgv/CIkhKBzXbrMinvzU1CG lCAHvk/1C1efUUSXhXa+wwXhIc3YmaLhcpOev6F8VIcws5vWpjXUuC7hgtTJGNfF4EWJ efAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701526896; x=1702131696; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jZnEPdvbIgtDgAWMFIOxMorVdAO86g0WLD9WvpuEjYc=; b=PjNlZ4og0qFBBYjxHxL5+eFS4uAcAGRyC2My1K4T8Nt1K8qBugss26k5a72FMlnEYw Own3MRdkfWBiwAe2gKujNTjZPuvxblzK2FvaYzAv1meNlsfD0e5OHRwBPFeYN2WCKGyP QYefjdG0I++nEQuDTNkk0hV4w4pEfcr8sRc1zDMltgAJ3RWOTbZCDeNlOQnS/LEKWuP7 GwholJt8pfWi4j0cpiw//vJhBt7VH0gteTGNl94yxZ1WRMuyDz6YftulzgYAH8FZHrOc q4V7fVkg5FjmeuOE456iYWDVJIRFBI2+9jis05FX9uCufAWvvh6VoTemICq7p5rCEhHn RxMA== X-Gm-Message-State: AOJu0YwAaL5ZerYdFDjVh8Itq0KmYf78IbZM+QHfRc4BPhhtgPtXNNbI 8l5G+3uh/8ra4yu4r8ydQDiS5Rs4tls= X-Google-Smtp-Source: AGHT+IHpLE72ZXE2SR/wXkonHY3R5JPHtXxGzYv2BW42dMhfWhj3tVP8uKfxgPwaM8Dax0BoKjVRJg== X-Received: by 2002:a2e:9bc9:0:b0:2c9:d874:20d5 with SMTP id w9-20020a2e9bc9000000b002c9d87420d5mr1507460ljj.95.1701526895907; Sat, 02 Dec 2023 06:21:35 -0800 (PST) Received: from elephant ([5.166.207.17]) by smtp.gmail.com with ESMTPSA id v26-20020a2e961a000000b002c9bc53f2ffsm694422ljh.109.2023.12.02.06.21.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 06:21:35 -0800 (PST) From: "Artyom V. Poptsov" Date: Sat, 02 Dec 2023 17:21:31 +0300 Message-ID: <87h6l0k7mc.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22a; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x22a.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hello, this patch improves Guile-GitLab package style. - avp From 320dd53ea6a0e81a8404238b2b73bd9f02caad2b Mon Sep 17 00:00:00 2001 Message-ID: <320dd53ea6a0e81a8404238b2b73bd9f02caad2b.1701526695.git.poptsov.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Sat, 2 Dec 2023 17:18:12 +0300 Subject: [PATCH] gnu: guile-gitlab: Improve the package style. * gnu/packages/guile-xyz.scm (guile-gitlab): Improve the package style. [inputs]: Remove input labels. Change-Id: I449a02e1f9d700f678bb09961b896dea1627632e --- gnu/packages/guile-xyz.scm | 64 +++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b3ac661e77..f46246f1c6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5408,49 +5408,41 @@ (define-public guile-gitlab (commit (string-append "v" version)))) (file-name (string-append name "-" version)) (sha256 - (base32 - "0srkmchd4kmfa7q65r6fdzwklhgdlck1ll0s7smzs8ddjdgz2lwm")))) + (base32 "0srkmchd4kmfa7q65r6fdzwklhgdlck1ll0s7smzs8ddjdgz2lwm")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings + `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) ,@%gnu-build-system-modules) #:imported-modules ((guix build guile-build-system) ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (guile-lib (assoc-ref inputs "guile-lib")) - (json (assoc-ref inputs "guile-json")) - (tls (assoc-ref inputs "guile-gnutls")) - (version (target-guile-effective-version)) - (scm (string-append "/share/guile/site/" - version)) - (go (string-append "/lib/guile/" - version "/site-ccache"))) - (wrap-program (string-append bin "/gitlab-cli") - `("GUILE_LOAD_PATH" prefix - (,(string-append out scm) - ,(string-append guile-lib scm) - ,(string-append json scm) - ,(string-append tls scm))) - `("GUILE_LOAD_COMPILED_PATH" prefix - (,(string-append out go) - ,(string-append guile-lib go) - ,(string-append json go) - ,(string-append tls go)))))))))) - (native-inputs - (list autoconf automake pkg-config texinfo)) - (inputs - `(("bash" ,bash-minimal) - ("guile" ,guile-2.2) - ("guile-json" ,guile2.2-json) - ("guile-lib" ,guile2.2-lib) - ("guile-gnutls" ,guile2.2-gnutls))) + #:phases (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (guile-lib (assoc-ref inputs "guile2.2-lib")) + (json (assoc-ref inputs "guile2.2-json")) + (tls (assoc-ref inputs "guile2.2-gnutls")) + (version (target-guile-effective-version)) + (scm (string-append "/share/guile/site/" version)) + (go (string-append "/lib/guile/" version + "/site-ccache"))) + (wrap-program (string-append bin "/gitlab-cli") + `("GUILE_LOAD_PATH" prefix + (,(string-append out scm) ,(string-append + guile-lib scm) + ,(string-append json scm) + ,(string-append tls scm))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append out go) ,(string-append guile-lib + go) + ,(string-append json go) + ,(string-append tls go)))))))))) + (native-inputs (list autoconf automake pkg-config texinfo)) + (inputs (list bash-minimal guile-2.2 guile2.2-json guile2.2-lib + guile2.2-gnutls)) (home-page "https://github.com/artyom-poptsov/guile-gitlab") (synopsis "Guile interface to GitLab") (description base-commit: aeb494322ca9dec4a4d66a7d063239c8536bd538 -- 2.41.0