From patchwork Wed May 10 16:39:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 49914 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 308F327BBEE; Wed, 10 May 2023 17:40:58 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 3AB4C27BBED for ; Wed, 10 May 2023 17:40:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwmrG-0006Ym-1J; Wed, 10 May 2023 12:40:06 -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 1pwmrC-0006Xz-Rr for guix-patches@gnu.org; Wed, 10 May 2023 12:40:02 -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-0005w0-FY 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-0003P5-B3 for guix-patches@gnu.org; Wed, 10 May 2023 12:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63420] [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package. References: <20230510163446.2635-1-GNUtoo@cyberdimension.org> In-Reply-To: <20230510163446.2635-1-GNUtoo@cyberdimension.org> 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.168373677113006 (code B ref 63420); Wed, 10 May 2023 16:40:02 +0000 Received: (at 63420) by debbugs.gnu.org; 10 May 2023 16:39:31 +0000 Received: from localhost ([127.0.0.1]:48849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwmqh-0003Nc-4D for submit@debbugs.gnu.org; Wed, 10 May 2023 12:39:31 -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 1pwmqe-0003NM-Vu for 63420@debbugs.gnu.org; Wed, 10 May 2023 12:39:29 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id f47cc4f2; Wed, 10 May 2023 16:39:27 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id db663285; Wed, 10 May 2023 16:39:27 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 10 May 2023 18:39:22 +0200 Message-Id: <20230510163925.3071-1-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.39.2 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 Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/packages/linux.scm | 60 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ea64e9d241..c2449f0b45 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -66,7 +66,7 @@ ;;; Copyright © 2022 Artyom V. Poptsov ;;; Copyright © 2022 Rene Saavedra ;;; Copyright © 2022 muradm -;;; Copyright © 2022 Denis 'GNUtoo' Carikli +;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Hunter Jozwiak ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2022 Stefan @@ -5884,14 +5884,13 @@ (define-public btrfs-progs (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" - "people/kdave/btrfs-progs/" - "btrfs-progs-v" version ".tar.xz")) + "people/kdave/btrfs-progs/" "btrfs-progs-v" + version ".tar.xz")) (sha256 (base32 "0ylxszcsm0jqsa5glccd1pv3rcfk1f5wjcf3ayxc0r9xgzcngrkb")))) (build-system gnu-build-system) - (outputs '("out" - "static")) ; static versions of the binaries in "out" + (outputs '("out" "static")) ;static versions of the binaries in "out" (arguments '(#:configure-flags ;; The ‘Python support’ was never actually installed by previous @@ -5904,29 +5903,33 @@ (define-public btrfs-progs (("\\$\\(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. + (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 + #: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:lib" ,util-linux "lib") ;for libblkid and libuuid ("util-linux:static" ,util-linux "static") ;ditto ("zlib" ,zlib) ("zlib:static" ,zlib "static") @@ -5938,14 +5941,15 @@ (define-public btrfs-progs ;; For tests. ("acl" ,acl) ("dmsetup" ,lvm2) - ("grep" ,grep) ; need Perl regexp support + ("grep" ,grep) ;need Perl regexp support ("libaio" ,libaio) ("liburing" ,liburing) - ("util-linux" ,util-linux) ; for fallocate + ("util-linux" ,util-linux) ;for fallocate ("which" ,which))) (home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page") (synopsis "Create and manage btrfs copy-on-write file systems") - (description "Btrfs is a @acronym{CoW, copy-on-write} file system for Linux + (description + "Btrfs is a @acronym{CoW, copy-on-write} file system for Linux aimed at implementing advanced features while focusing on fault tolerance, repair and easy administration.") ;; GPL2+: crc32.c, radix-tree.c, raid6.c, rbtree.c. From patchwork Wed May 10 16:39:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 49912 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 B52F827BBEE; Wed, 10 May 2023 17:40:42 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 CC52227BBEC for ; Wed, 10 May 2023 17:40:41 +0100 (BST) 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 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/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 From patchwork Wed May 10 16:39:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 49913 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 A550F27BBEE; Wed, 10 May 2023 17:40:55 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 DBD1927BBEC for ; Wed, 10 May 2023 17:40:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwmrG-0006Yt-OS; Wed, 10 May 2023 12:40:06 -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-0006YG-IV 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 1pwmrD-00060K-8y for guix-patches@gnu.org; Wed, 10 May 2023 12:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwmrD-0003PJ-5E for guix-patches@gnu.org; Wed, 10 May 2023 12:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63420] [PATCH v1 3/4] gnu: btrfs-progs: Make the python-sphinx input conditional. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2023 16:40:03 +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.168373677413028 (code B ref 63420); Wed, 10 May 2023 16:40:03 +0000 Received: (at 63420) by debbugs.gnu.org; 10 May 2023 16:39:34 +0000 Received: from localhost ([127.0.0.1]:48854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwmqj-0003Ny-CE 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-TK for 63420@debbugs.gnu.org; Wed, 10 May 2023 12:39:31 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 394f0de7; Wed, 10 May 2023 16:39:28 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 91199b15; Wed, 10 May 2023 16:39:27 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 10 May 2023 18:39:24 +0200 Message-Id: <20230510163925.3071-3-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 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/linux.scm (btrfs-progs) [native-inputs]: Make the python-sphinx input conditional. [arguments]: Conditionally add --disable-documentation to configure flags. Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/packages/linux.scm | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a71100baab..e910c47ab9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5894,9 +5894,18 @@ (define-public btrfs-progs (arguments (list #:configure-flags - ;; The ‘Python support’ was never actually installed by previous - ;; versions of this package, but did prevent cross-compilation. - #~(list "--disable-python") + #~(append + ;; Without --disable-documentation, it complains about missing + ;; python-sphinx on systems where this package isn't available + ;; (because it requires Rust). + (if #$@(member (%current-system) + (package-transitive-supported-systems + python-sphinx)) + '() + (list "--disable-documentation")) + ;; 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) @@ -5935,15 +5944,24 @@ (define-public btrfs-progs `(,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)) + (native-inputs + (append + ;; For building documentation. Since python-sphinx + ;; requires Rust, add it conditionally depending on such + ;; support. + (if (member (%current-system) + (package-transitive-supported-systems + python-sphinx)) + (list python-sphinx) + '()) + (list pkg-config + 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 From patchwork Wed May 10 16:39:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 49911 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 35C8D27BBEE; Wed, 10 May 2023 17:40:28 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 8FD7D27BBEC for ; Wed, 10 May 2023 17:40:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwmrI-0006ZO-CI; Wed, 10 May 2023 12:40: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 1pwmrD-0006YI-VE for guix-patches@gnu.org; Wed, 10 May 2023 12:40:04 -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 1pwmrD-00063j-MC for guix-patches@gnu.org; Wed, 10 May 2023 12:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwmrD-0003PR-IF for guix-patches@gnu.org; Wed, 10 May 2023 12:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63420] [PATCH v1 4/4] gnu: btrfs-progs: Update to 6.3. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2023 16:40:03 +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.168373677413034 (code B ref 63420); Wed, 10 May 2023 16:40:03 +0000 Received: (at 63420) by debbugs.gnu.org; 10 May 2023 16:39:34 +0000 Received: from localhost ([127.0.0.1]:48856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwmqj-0003O5-Oc for submit@debbugs.gnu.org; Wed, 10 May 2023 12:39:34 -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 1pwmqh-0003NM-QS for 63420@debbugs.gnu.org; Wed, 10 May 2023 12:39:32 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 2d79e059; Wed, 10 May 2023 16:39:28 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 4e854eba; Wed, 10 May 2023 16:39:28 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 10 May 2023 18:39:25 +0200 Message-Id: <20230510163925.3071-4-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 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/linux.scm (btrfs-progs): Update to 6.3. Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e910c47ab9..5ac958e2e2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5880,7 +5880,7 @@ (define-public gpm (define-public btrfs-progs (package (name "btrfs-progs") - (version "6.1.2") + (version "6.3") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -5888,7 +5888,7 @@ (define-public btrfs-progs version ".tar.xz")) (sha256 (base32 - "0ylxszcsm0jqsa5glccd1pv3rcfk1f5wjcf3ayxc0r9xgzcngrkb")))) + "0zbampc47nq3h8as3rda2apns5sj93ywxnrkal74kjvyg3zvv820")))) (build-system gnu-build-system) (outputs '("out" "static")) ;static versions of the binaries in "out" (arguments