From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id wHmcAQrJW2SVagEASxT56A (envelope-from ) for ; Wed, 10 May 2023 18:40:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mEfdAQrJW2RscAEAauVa8A (envelope-from ) for ; Wed, 10 May 2023 18:40:42 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C96A7312F for ; Wed, 10 May 2023 18:40:41 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwmrH-0006ZB-Pa; Wed, 10 May 2023 12:40:07 -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 1pwmrD-0006Y7-6H for guix-patches@gnu.org; Wed, 10 May 2023 12:40:03 -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 1pwmrC-0005xB-Sv for guix-patches@gnu.org; Wed, 10 May 2023 12:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwmrC-0003PC-OA for guix-patches@gnu.org; Wed, 10 May 2023 12:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63420] [PATCH v1 2/4] gnu: btrfs-progs: Use new style inputs and gexps. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2023 16:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari , Tobias Geerinckx-Rice , 63420@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli Received: via spool by 63420-submit@debbugs.gnu.org id=B63420.168373677313021 (code B ref 63420); Wed, 10 May 2023 16:40:02 +0000 Received: (at 63420) by debbugs.gnu.org; 10 May 2023 16:39:33 +0000 Received: from localhost ([127.0.0.1]:48852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwmqi-0003Nv-SM for submit@debbugs.gnu.org; Wed, 10 May 2023 12:39:33 -0400 Received: from cyberdimension.org ([80.67.179.20]:49868 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwmqg-0003NM-1C for 63420@debbugs.gnu.org; Wed, 10 May 2023 12:39:30 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id a3bc605f; Wed, 10 May 2023 16:39:28 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 4b47d07e; Wed, 10 May 2023 16:39:27 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 10 May 2023 18:39:23 +0200 Message-Id: <20230510163925.3071-2-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230510163925.3071-1-GNUtoo@cyberdimension.org> References: <20230510163925.3071-1-GNUtoo@cyberdimension.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683736841; a=rsa-sha256; cv=none; b=WxUo+1gK1dX/+C4utkiZN+iKdpudb6gqCZJvmd43FyShPfSRZIsOQLGPYpHK1p8ySIsT+L QqWJ+AG3CfCX9ABB4C16VdI/RnYrQFgUp7kEsI0CO/zx3losbbaVGvcowLSxcKlx2OKZ2T 8DSJ6VXdPCVth38IYPUjnY7Um+i1yMIsznf4bYMDTCswZhaHVLVCWHat7O8os+xP5UHFas O3GYAKeqTxdAmnzuQHI0T1A+QV/L7DbHHNAlOuiKa9ozgyGNQAc7Et6MAs+fX7CM9DhUoT B1kYePt0sn6IEOtUWX4IT2QyPnydRYaZ6MndafKvQs4zHXx/5dwZ9yPCHuNvGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683736841; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=MRW1I9UqvPrW02jeNgrSF3zafh8rXj33fs3+wtEBB9E=; b=tATtO0T54Z3T1qdfuil8ZQTxST+EpCYOgh1ZaTOdWxW+KdmcKdgQPcxucMduY14Ks6aNTf TIEvGnpiwaurjXDh1ehcsP8Ti5Qq2UEyyH9Fh/FRnEpQl68ZbE1MDhGgIylpg+KAM6xLwH zbJb67FhvQHslnCryg0neMOUweQ9cACV33/AIkLupfF2OckS03Vjc2szQZZlEAaJLN8Qua sWb62A/GgwOvcFcWdiP9NyVVUoYyKttLdYCZP8HbyA+D1s27XmTc7WQEIoGvqYeDQshgkp IWd2VV1tnoLqRIMbehLHK8BT2cAew+d536TUy+R7qH4SmPEEPZOLmuL/qmznng== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.18 X-Spam-Score: -2.18 X-Migadu-Queue-Id: C96A7312F X-TUID: nbyocvg1NJyo * gnu/packages/linux.scm (btrfs-progs)[arguments]: Use new style and gexps. [inputs]: Use new style. Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/packages/linux.scm | 100 ++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 51 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c2449f0b45..a71100baab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5892,60 +5892,58 @@ (define-public btrfs-progs (build-system gnu-build-system) (outputs '("out" "static")) ;static versions of the binaries in "out" (arguments - '(#:configure-flags - ;; The ‘Python support’ was never actually installed by previous - ;; versions of this package, but did prevent cross-compilation. - (list "--disable-python") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-makefile - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("\\$\\(DESTDIR\\)\\$\\(udevruledir\\)") - (string-append (assoc-ref outputs "out") - "/lib/udev/rules.d"))))) - (add-after 'build 'build-static - (lambda _ - (invoke "make" "static"))) - (add-after 'install 'install-bash-completion - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bashcomp (string-append out - "/etc/bash_completion.d"))) - (mkdir-p bashcomp) - (copy-file "btrfs-completion" - (string-append bashcomp "/btrfs"))))) - (add-after 'install 'install-static - (let ((staticbin (string-append (assoc-ref %outputs - "static") - "/bin"))) - (lambda _ - (invoke "make" - (string-append "bindir=" staticbin) - "install-static"))))) + (list + #:configure-flags + ;; The ‘Python support’ was never actually installed by previous + ;; versions of this package, but did prevent cross-compilation. + #~(list "--disable-python") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("\\$\\(DESTDIR\\)\\$\\(udevruledir\\)") + (string-append (assoc-ref outputs "out") + "/lib/udev/rules.d"))))) + (add-after 'build 'build-static + (lambda _ + (invoke "make" "static"))) + (add-after 'install 'install-bash-completion + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bashcomp (string-append out + "/etc/bash_completion.d"))) + (mkdir-p bashcomp) + (copy-file "btrfs-completion" + (string-append bashcomp "/btrfs"))))) + (add-after 'install 'install-static + (let ((staticbin (string-append (assoc-ref %outputs + "static") + "/bin"))) + (lambda _ + (invoke "make" + (string-append "bindir=" staticbin) + "install-static"))))) #:tests? #f ;XXX: require the 'btrfs' kernel module. #:test-target "test" #:parallel-tests? #f)) ;tests fail when run in parallel - (inputs `(("e2fsprogs" ,e2fsprogs) - ;for btrfs-convert - ("eudev" ,eudev) - ("lzo" ,lzo) - ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid - ("util-linux:static" ,util-linux "static") ;ditto - ("zlib" ,zlib) - ("zlib:static" ,zlib "static") - ("zstd" ,zstd "lib") - ("zstd:static" ,zstd "static"))) - (native-inputs `(("pkg-config" ,pkg-config) - ;; For building documentation. - ("python-sphinx" ,python-sphinx) - ;; For tests. - ("acl" ,acl) - ("dmsetup" ,lvm2) - ("grep" ,grep) ;need Perl regexp support - ("libaio" ,libaio) - ("liburing" ,liburing) - ("util-linux" ,util-linux) ;for fallocate - ("which" ,which))) + (inputs (list e2fsprogs ;; For btrfs-convert. + eudev + lzo + `(,util-linux "lib") ;; For libblkid and libuuid. + `(,util-linux "static") ;; Ditto. + zlib + `(,zlib "static") + `(,zstd "lib") + `(,zstd "static"))) + (native-inputs (list pkg-config + python-sphinx ;; For building documentation. + acl ;; For tests. + lvm2 ;; For dmsetup. + grep ;; Need Perl regexp support. + libaio + liburing + util-linux ;; For fallocate. + which)) (home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page") (synopsis "Create and manage btrfs copy-on-write file systems") (description -- 2.39.2