[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/15: gnu: btrfs-progs: Use new style inputs and gexps.
From: |
guix-commits |
Subject: |
07/15: gnu: btrfs-progs: Use new style inputs and gexps. |
Date: |
Thu, 18 May 2023 14:07:08 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 5d84a90694a30d3d5c0a3058562938af448c829d
Author: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
AuthorDate: Wed May 10 18:39:23 2023 +0200
gnu: btrfs-progs: Use new style inputs and gexps.
* gnu/packages/linux.scm (btrfs-progs)[arguments]: Use new style and gexps.
[inputs]: Use new style.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
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 79809c33fb..a0248106b6 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5925,60 +5925,58 @@ and copy/paste text in the console and in xterm.")
(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
- branch master updated (5b700945fb -> 2344ccee2f), guix-commits, 2023/05/18
- 06/15: gnu: btrfs-progs: Run 'guix style' over the package., guix-commits, 2023/05/18
- 03/15: gnu: libfive: Fix install and wrap Studio., guix-commits, 2023/05/18
- 05/15: gnu: libfive: Generate bindings instead of using pre-generated ones., guix-commits, 2023/05/18
- 08/15: gnu: btrfs-progs: Make the python-sphinx input conditional., guix-commits, 2023/05/18
- 02/15: refresh: Honor '--key-server'., guix-commits, 2023/05/18
- 01/15: doc: Change '--with-configure-flag' example to something that works., guix-commits, 2023/05/18
- 04/15: gnu: libfive: Add Python bindings., guix-commits, 2023/05/18
- 07/15: gnu: btrfs-progs: Use new style inputs and gexps.,
guix-commits <=
- 09/15: gnu: btrfs-progs: Update to 6.3., guix-commits, 2023/05/18
- 10/15: gnu: swaylock: Add linux-pam to inputs., guix-commits, 2023/05/18
- 13/15: gnu: f3d: Update to 2.0.0., guix-commits, 2023/05/18
- 14/15: style: Add 'arguments' styling rule., guix-commits, 2023/05/18
- 15/15: news: Add entry to 'guix style -S arguments'., guix-commits, 2023/05/18
- 11/15: gnu: cxxopts: Update to 3.1.1., guix-commits, 2023/05/18
- 12/15: gnu: discregrid: Fix for dependent updates., guix-commits, 2023/05/18