From patchwork Sun May 21 23:14:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50213 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 A2D2127BBEA; Mon, 22 May 2023 00:16:21 +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_INVALID, DKIM_SIGNED,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 C431427BBE2 for ; Mon, 22 May 2023 00:16:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0sHY-00047y-Bp; Sun, 21 May 2023 19:16: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 1q0sHW-00047c-FX for guix-patches@gnu.org; Sun, 21 May 2023 19:16:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0sHS-0007Hh-LZ for guix-patches@gnu.org; Sun, 21 May 2023 19:16:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q0sHS-0004gz-HA for guix-patches@gnu.org; Sun, 21 May 2023 19:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63635] [PATCH 1/2] gnu: sbsigntools: Convert to gexp, new-style inputs. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 May 2023 23:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63635 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63635@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 63635-submit@debbugs.gnu.org id=B63635.168471090417949 (code B ref 63635); Sun, 21 May 2023 23:16:02 +0000 Received: (at 63635) by debbugs.gnu.org; 21 May 2023 23:15:04 +0000 Received: from localhost ([127.0.0.1]:33001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0sGW-0004fM-Ar for submit@debbugs.gnu.org; Sun, 21 May 2023 19:15:04 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:39994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0sGT-0004eT-N2 for 63635@debbugs.gnu.org; Sun, 21 May 2023 19:15:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=lY0HLMvGuMEfcfX fh/ADkWPVAYofZueizBQAxsYxxeo=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=NSbW8ag6zZe47GmoXIJDuS4+dsSv1171GSfRstkT HMaqCrm0xt8osaghShX+ouQAP590Qi6JvDXX7FuvWnD3ZOr6oeB5HAXIvPxir7kt7xkSGT bKn7Pvf/IsY7WPJAcyCKJpGvL9lRC00IbuTZDYYgtsE1XRZx1NXlnX+KwsgdY= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id d3e1a1e4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 21 May 2023 23:15:00 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f093d2e2; Sun, 21 May 2023 23:15:00 +0000 (UTC) Date: Sun, 21 May 2023 16:14:50 -0700 Message-Id: <0862d94d5bd537e3ea02e268eff832d78aaba3be.1684710672.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 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: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner 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/efi.scm (sbsigntools): Convert to gexp, new-style inputs. --- gnu/packages/efi.scm | 54 +++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 75eb24bf86..b3da555549 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -30,6 +30,7 @@ (define-module (gnu packages efi) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) @@ -113,31 +114,28 @@ (define-public sbsigntools (base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lib/ccan.git/tools/create-ccan-tree" - (("#!/bin/bash") - (string-append "#!" - (assoc-ref inputs "bash") - "/bin/bash"))) - #t)) - (add-after 'unpack 'patch - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("configure.ac" - "tests/Makefile.am") - (("/usr/include/efi") - (string-append (assoc-ref inputs "gnu-efi") - "/include/efi")) - (("/usr/lib/gnuefi") - (string-append (assoc-ref inputs "gnu-efi") - "/lib"))) - #t)) - (add-after 'unpack 'setenv - (lambda _ - (setenv "CC" "gcc") - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-more-shebangs + (lambda _ + (substitute* "lib/ccan.git/tools/create-ccan-tree" + (("#!/bin/bash") + (string-append "#!" #$bash "/bin/bash"))) + #t)) + (add-after 'unpack 'patch + (lambda _ + (substitute* '("configure.ac" + "tests/Makefile.am") + (("/usr/include/efi") + (string-append #$gnu-efi "/include/efi")) + (("/usr/lib/gnuefi") + (string-append #$gnu-efi "/lib"))) + #t)) + (add-after 'unpack 'setenv + (lambda _ + (setenv "CC" "gcc") + #t))))) (native-inputs (list autoconf automake @@ -146,9 +144,9 @@ (define-public sbsigntools pkg-config util-linux)) ; getopt (inputs - `(("gnu-efi" ,gnu-efi) - ("libuuid" ,util-linux "lib") - ("openssl" ,openssl))) + (list gnu-efi + (list util-linux "lib") + openssl)) (synopsis "EFI signing tools") (description "This package provides tools for signing EFI binaries.") (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/")