From patchwork Thu Feb 23 11:31:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zongyuan Li X-Patchwork-Id: 47240 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 1813316BBF; Thu, 23 Feb 2023 18:56:05 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 0161F16BA9 for ; Thu, 23 Feb 2023 18:56:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVGkK-0007gp-92; Thu, 23 Feb 2023 13:55:12 -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 1pVGkA-0007L3-Uu for guix-patches@gnu.org; Thu, 23 Feb 2023 13:55:05 -0500 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 1pVGkA-0003g6-Mc for guix-patches@gnu.org; Thu, 23 Feb 2023 13:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVGkA-0008NG-IV for guix-patches@gnu.org; Thu, 23 Feb 2023 13:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61682] [PATCH v2] gnu: buildah: Add 'buildah' package References: <20230221143500.42127-1-zongyuan.li@c0x0o.me> In-Reply-To: <20230221143500.42127-1-zongyuan.li@c0x0o.me> Resent-From: Zongyuan Li Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Feb 2023 18:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61682@debbugs.gnu.org Cc: Zongyuan Li Received: via spool by 61682-submit@debbugs.gnu.org id=B61682.167717844232074 (code B ref 61682); Thu, 23 Feb 2023 18:55:02 +0000 Received: (at 61682) by debbugs.gnu.org; 23 Feb 2023 18:54:02 +0000 Received: from localhost ([127.0.0.1]:35318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVGjC-0008L3-7Q for submit@debbugs.gnu.org; Thu, 23 Feb 2023 13:54:02 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:16571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV9pE-0007xn-AD for 61682@debbugs.gnu.org; Thu, 23 Feb 2023 06:31:49 -0500 Date: Thu, 23 Feb 2023 11:31:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c0x0o.me; s=protonmail; t=1677151900; x=1677411100; bh=5vuHPG7w0dDVE/Jg/nCk9gfmpo1GWB/sX6LNL5Z2ASM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=TGvHEdre4TL0VqdvE8N93MiTCW8qaCCW2T4gMafH9yMKyIepFyh0Ocg4XAoXWYyQZ zXJClNdQTwpc0b7l1dKKEiZkZV+I4gjwcO6zDxjHsmiVJNkBFE+2pUoapovL2shqcP FRj3VJhFLkyTQbMNm9lsbzsijILSuiBz1kzahEiTn2a8YLggIyU7mbrT4vPrA0ABq+ TYKicyBi0D3FV1t28GunUxANU5OR7IBiAkqh21m2CJpL9nfgENdF0wbY0GjANDNSgM kBHwpZLOgdC/MEaNo6JmPfXGpK9AWPUePq8I1RTuV92OyLGEUBT2YBafxfh1Ik1v3g Yqumq7tOVguhQ== Message-ID: <20230223113014.53355-1-zongyuan.li@c0x0o.me> Feedback-ID: 67462066:user:proton MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 23 Feb 2023 13:54:01 -0500 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: Zongyuan Li X-ACL-Warn: , Zongyuan Li via Guix-patches X-Patchwork-Original-From: Zongyuan Li via Guix-patches via From: Zongyuan Li 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 Introduce new 'buildah' package Changes since v1: * fix phase-name typo in modify-phases * gnu/packages/containers.scm: New 'buildah' package --- gnu/packages/containers.scm | 68 +++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) -- 2.39.1 diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 50dfa88421..3844e4e700 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -41,6 +41,7 @@ (define-module (gnu packages containers) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages linux) + #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) @@ -406,3 +407,70 @@ (define-public podman volumes mounted into those containers, and pods made from groups of containers.") (license license:asl2.0))) + +(define-public buildah + (package + (name "buildah") + (version "1.29.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/buildah") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16kc19m5in819624c3np4aqb9hkjc93d34y4958jqy1k3p2p5rir")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags #~(list #$(string-append "CC=" + (cc-for-target)) + (string-append "PREFIX=" + #$output)) + #:tests? #f + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'set-env + (lambda* (#:key inputs #:allow-other-keys) + (setenv "HOME" "/tmp"))) + (add-after 'unpack 'avoid-building-tools + (lambda _ + (substitute* "Makefile" + (("^docs: install\\.tools") + "docs:")))) + (add-after 'unpack 'avoid-unnecessary-targets + (lambda _ + (substitute* "Makefile" + (("^all: .*") + "all: bin/buildah docs")))) + (add-after 'unpack 'use-doc-tools + (lambda _ + (substitute* "docs/Makefile" + (("../tests/tools/build/go-md2man") + (which "go-md2man"))))) + (add-after 'install 'install-completions + (lambda _ + (invoke "make" "install.completions" + (string-append "PREFIX=" + #$output))))))) + (inputs (list btrfs-progs + cni-plugins + conmon + eudev + glib + go-github-com-go-md2man + gpgme + libassuan + libseccomp + lvm2 + runc)) + (native-inputs (list bats git go-1.18 perl pkg-config)) + (synopsis + "Facilitates building Open Container Initiative (OCI) container images") + (description + "Buildah is an open source, Linux-based tool used to build Open Container +Initiative (OCI)-compatible containers. With Buildah, you can use your +favorite tools to create efficient container images from an existing base image +or from scratch using an empty image.") + (home-page "https://buildah.io") + (license license:asl2.0)))