From patchwork Mon Apr 1 10:43:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62420 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 2F0DD27BBEE; Mon, 1 Apr 2024 11:44:24 +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=-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 538BD27BBE2 for ; Mon, 1 Apr 2024 11:44:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrF96-0006uY-Tk; Mon, 01 Apr 2024 06:44:08 -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 1rrF95-0006tQ-3E for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:07 -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 1rrF94-0002Pb-Ra for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrF97-0005uf-Rh for guix-patches@gnu.org; Mon, 01 Apr 2024 06:44:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70123] [PATCH 11/12] gnu: fiano: Refresh package style. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 10:44:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70123@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 70123-submit@debbugs.gnu.org id=B70123.171196824822713 (code B ref 70123); Mon, 01 Apr 2024 10:44:09 +0000 Received: (at 70123) by debbugs.gnu.org; 1 Apr 2024 10:44:08 +0000 Received: from localhost ([127.0.0.1]:49683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF95-0005u0-SL for submit@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:08 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:57600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrF92-0005qo-OB for 70123@debbugs.gnu.org; Mon, 01 Apr 2024 06:44:05 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-513d4559fb4so4704730e87.3 for <70123@debbugs.gnu.org>; Mon, 01 Apr 2024 03:44:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711968236; x=1712573036; 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=ghZsEnrQQy924LP7FJprk4qtNtlRxl9WGqnU2pWvqiE=; b=eOroVX56BhyRD5SWbFGj8Qe9yKZEyx7YvxLyvP03/vY9JNi1o6OG0/BHBUimkK1USY YhZ28ltG9J4CS7hjbVuO5+MU+Ot6DhJ+SJmx1HOxKt/JcH+ltK18bbACyZ7I294LAAGe xA9JC+DnJ5bY7shugF6belYFxFcHa1V0r3e1zVGeY5Y8jLmmPsVzuB+nNO9vXt82nTsP kQXqDxEOO8yTzOV1CDZznaLtxZV5xpLdFkUh5DJbXZkwQxJ47fNnh1XsiLWpqI3sXQwq yRbPhCeHoJ3puKdy5KW1K51HVCh6c6X9BM8rxWjCw+obZOmreGPgGH3E8cDeGLhYQ7Vp ILrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711968236; x=1712573036; 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=ghZsEnrQQy924LP7FJprk4qtNtlRxl9WGqnU2pWvqiE=; b=gWH82NX6sivTUmlmE5ZSwK2J1ANMEfdjv1+yisMkBAKGWpd//PkEzDvrK0mMIK3KKO hamgs33wduPFbIdJwy2+Uw8BhtOu0bPVyvyV5dWo9CH3Jz4t5labVi39Mr9cHFxfuttI 7gdDAlW67rwyg7Z5j2QAL2aaJ36sQmjIdVfkmmppXsHNu8FA/yShHsO+ZNR8sQcf5vPr aTXu4cdRWW7vZDzbOAUya6tqr1EL2QVCuh3lG+UTt5ZJB1m2J8kTk/IVD287T1H+EC7d aC7/4TZgsEJLXkTEe82yEWwj5yAjoaygkXqQf4cCcGc8wNAbj6OOXvraCKa9hhWAx0mh fjyg== X-Gm-Message-State: AOJu0Yz+Fy4fOkMBpWyEppT9Pm8/HIdQSGgJu3Mt/8ROocTagHZ70OUT 9BP2KVKJ/PB6oyWtD6SEztLPzdrtQ2buaHotmgOc2L20iGBwHq2y+UJsB2JRydk= X-Google-Smtp-Source: AGHT+IHOJsn3y8wWN50Xv7d1xn93fGKeL+9yxp7pegbSrY6XrgatN5aQxDqXy2Cd6c4XGQPflt/tow== X-Received: by 2002:a05:6512:3f1c:b0:513:c9a6:46ce with SMTP id y28-20020a0565123f1c00b00513c9a646cemr8243368lfa.9.1711968235471; Mon, 01 Apr 2024 03:43:55 -0700 (PDT) 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 iv16-20020a05600c549000b004146a1bf590sm17468404wmb.32.2024.04.01.03.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 03:43:55 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 1 Apr 2024 11:43:41 +0100 Message-ID: <58c0c7e846eaadbb1806dc2a2443576648a4b122.1711915492.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 * gnu/packages/admin.scm (fiano): Refresh package style. [source]: Remove trailing #t from the snippet. [arguments]: Use list style. [inputs]: Remove labels and use list style. [home-page]: Place before synopsis. Change-Id: I896c59d4be14c7ed16bc1978e0d9996bd7b93c17 --- gnu/packages/admin.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2b94b1e17a..78e5e355d6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5160,7 +5160,7 @@ (define-public atop `((release-monitoring-url . "https://www.atoptool.nl/downloadatop.php"))) (license license:gpl2+))) -;; TODO: Unvendor u-root (pkg: forth, golang, testutil). +;; TODO: Pack u-root for: forth, and some tests. (define fiano (package (name "fiano") @@ -5170,28 +5170,26 @@ (define fiano (uri (git-reference (url "https://github.com/linuxboot/fiano.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "03ihdwwhb7g6bihx141cn0924sjs5ps6q3ps58pk1cg0g0srrr9h")) (modules '((guix build utils))) (snippet - '(begin - (delete-file-recursively "vendor/golang.org") - (delete-file-recursively "vendor/github.com") - #t)))) + #~(begin + ;; Remove all vendored sources. + (delete-file-recursively "vendor"))))) (build-system go-build-system) (arguments - `(#:import-path "github.com/linuxboot/fiano" - #:unpack-path "github.com/linuxboot/fiano")) - (native-inputs - `()) + (list + #:import-path "github.com/linuxboot/fiano" + #:unpack-path "github.com/linuxboot/fiano")) (inputs - `(("go-golang-org-x-text" ,go-golang-org-x-text) - ("go-github-com-ulikunitz-xz" ,go-github-com-ulikunitz-xz))) - (synopsis "UEFI image editor") - (description "This package provides a command-line UEFI image editor.") + (list go-golang-org-x-text go-github-com-ulikunitz-xz)) (home-page "https://github.com/linuxboot/fiano") + (synopsis "UEFI image editor") + (description + "This package provides a command-line UEFI image editor.") (license license:bsd-3))) (define-public fiano-utk