From bb93042c8beb881ab907fa802eefb3c4091039a2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 00:24:28 +0100 Subject: gnu: util-linux: Move libraries to separate output. Fixes . Reported by Diego Nicola Barbato . * gnu/packages/linux.scm (util-linux)[outputs]: Add "lib". [arguments]: Update #:configure-flags and the "move-static-libraries" phase accordingly. Add phases "patch-build-scripts" and "adjust-pkg-config-files". (e2fsprogs, psm, mtd-utils, f2fs-tools, f2fs-tools-1.7, eudev, xfsprogs)[inputs]: Change to the "lib" output of UTIL-LINUX. (btrfs-progs)[inputs]: Remove duplicate UTIL-LINUX inputs and change to use the "lib" output. * gnu/packages/admin.scm (pam-mount)[inputs]: Add UTIL-LINUX:LIB. (testdisk)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/android.scm (abootimg)[inputs]: Likewise. * gnu/packages/audio.scm (jack-1)[propagated-inputs]: Likewise. * gnu/packages/bootloaders.scm (syslinux, vboot-utils)[inputs]: Likewise. * gnu/packages/chez.scm (chez-scheme)[inputs]: Likewise. * gnu/packages/cryptsetup.scm (cryptsetup, cryptsetup-static)[inputs]: Likewise. * gnu/packages/databases.scm (postgresql, 4store)[inputs]: Likewise. * gnu/packages/disk.scm (ndctl, gptfdisk, fdisk, gparted, rmlint, volume-key)[inputs]: Likewise. (parted)[inputs]: Likewise. [native-inputs]: Add UTIL-LINUX. * gnu/packages/efi.scm (sbsigntools)[inputs]: Add UTIL-LINUX:LIB. * gnu/packages/engineering.scm (lib3mf)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise. * gnu/packages/file-systems.scm (glusterfs, jfsutils, zfs)[inputs]: Likewise. * gnu/packages/firmware.scm (ovmf)[inputs]: Likewise. * gnu/packages/fontutils.scm (fontconfig)[propagated-inputs]: Likewise. * gnu/packages/freedesktop.scm (localed)[inputs]: Likewise. * gnu/packages/glib.scm (glib, appstream-glib)[propagated-inputs]: Likewise. * gnu/packages/gnome.scm (tracker, gnome-terminal)[inputs]: Likewise. * gnu/packages/jupyter.scm (xeus)[inputs]: Likewise. * gnu/packages/kde.scm (kpmcore)[inputs]: Likewise. * gnu/packages/kodi.scm (crossguid)[inputs]: Likewise. * gnu/packages/lighting.scm (ola)[inputs]: Likewise. * gnu/packages/music.scm (libgig)[inputs]: Likewise. * gnu/packages/nfs.scm (nfs-utils)[inputs]: Likewise. * gnu/packages/opencog.scm (opencog)[inputs]: Likewise. * gnu/packages/package-management.scm (msitools)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/password-utils.scm (pwsafe)[inputs]: Likewise. * gnu/packages/telephony.scm (pjproject)[propagated-inputs]: Likewise. * gnu/packages/rdf.scm (rasqal)[inputs]: Likewise. * gnu/packages/search.scm (xapian)[inputs]: Likewise. * gnu/packages/sssd.scm (sssd)[native-inputs]: Likewise. * gnu/packages/storage.scm (ceph)[inputs]: Add UTIL-LINUX:LIB. * gnu/packages/task-management.scm (taskwarrior)[inputs]: Change to the "lib" output of UTIL-LINUX. * gnu/packages/virtualization.scm (libvirt, xen)[inputs]: Likewise. * gnu/packages/xorg.scm (libsm)[inputs]: Likewise. --- gnu/packages/file-systems.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/file-systems.scm') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index a3dc993055..50afe29c77 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -127,7 +127,7 @@ single file can be mounted.") "jfsutils-include-systypes.patch")))) (build-system gnu-build-system) (inputs - `(("util-linux" ,util-linux))) + `(("util-linux" ,util-linux "lib"))) (home-page "http://jfs.sourceforge.net/home.html") (synopsis "Utilities for managing JFS file systems") (description @@ -271,7 +271,7 @@ non-determinism in the build process.") ("fuse", fuse) ("openssl" ,openssl) ("liburcu" ,liburcu) - ("libuuid" ,util-linux) + ("libuuid" ,util-linux "lib") ("libxml2" ,libxml2) ("readline" ,readline) ("zlib" ,zlib) @@ -503,7 +503,7 @@ APFS.") ("openssl" ,openssl) ("python" ,python) ("python-cffi" ,python-cffi) - ("util-linux" ,util-linux) + ("util-linux" ,util-linux "lib") ("zlib" ,zlib))) (home-page "https://zfsonlinux.org/") (synopsis "Native ZFS on Linux") -- cgit v1.2.3 From 4c88ae7b0331a7d671321a345eacc2bdb7595ee5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 7 May 2020 11:01:37 -0400 Subject: gnu: Add gphotofs. * gnu/packages/file-systems.scm (gphotofs): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/file-systems.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/file-systems.scm') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index ce1155c755..d8953016e5 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages nfs) #:use-module (gnu packages onc-rpc) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) @@ -56,6 +57,33 @@ #:use-module (gnu packages valgrind) #:use-module (gnu packages xml)) +(define-public gphotofs + (package + (name "gphotofs") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/gphoto/gphotofs/" version + "/gphotofs-0.5.tar.gz")) + (sha256 + (base32 + "04slwhr6ap9xcc27wphk22ad8yn79ngyy5z10lxams3k5liahvc2")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("fuse" ,fuse) + ("glib" ,glib) + ("libgphoto2" ,libgphoto2))) + (synopsis "Virtual filesystem for libgphoto2 using FUSE") + (description "GPhotoFS is a FUSE filesystem module to mount your camera as +a filesystem on Linux. This allow using your camera with any tool able to read +from a mounted filesystem.") + (home-page "http://www.gphoto.org/proj/gphotofs/") + (license license:gpl2+))) + (define-public bcachefs-tools (let ((commit "ab2f1ec24f5307b0cf1e3c4ad19bf350d9f54d9f") (revision "0")) -- cgit v1.2.3 From ed7f4d33b82c7ab3598f0b568a8be35122d4dd62 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 8 May 2020 18:19:55 +0300 Subject: gnu: zfs: Add missing input. Reported by ecbrown on IRC. * gnu/packages/file-systems.scm (zfs)[native-inputs]: Add kmod. --- gnu/packages/file-systems.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/file-systems.scm') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 281cdc78a9..1ecc416740 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Leo Famulari -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -581,6 +581,7 @@ APFS.") #t)))))) (native-inputs `(("attr" ,attr) + ("kmod" ,kmod) ("pkg-config" ,pkg-config))) (inputs `(("eudev" ,eudev) -- cgit v1.2.3 From c341b2addd29de5a04938987d55f319cfad81e96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 May 2020 23:19:52 +0200 Subject: gnu: fsarchiver: Move to (gnu packages file-systems). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/disk.scm (fsarchiver): Move this variable… * gnu/packages/file-systems.scm (fsarchiver): …here. --- gnu/packages/disk.scm | 36 ------------------------------------ gnu/packages/file-systems.scm | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 36 deletions(-) (limited to 'gnu/packages/file-systems.scm') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 15f08773f8..5c82ccd577 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -87,42 +87,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) -(define-public fsarchiver - (package - (name "fsarchiver") - (version "0.8.5") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/fdupoux/fsarchiver.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1rvwq5v3rl14bqxjm1ibfapyicf0sa44nw7451v10kx39lp56ylp")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) - (inputs - `(("bzip2" ,bzip2) - ("e2fsprogs" ,e2fsprogs) - ("libgcrypt" ,libgcrypt) - ("lz4" ,lz4) - ("lzo" ,lzo) - ("util-linux" ,util-linux "lib") - ("xz" ,xz) - ("zlib" ,zlib) - ("zstd:lib" ,zstd "lib"))) - (synopsis "Filesystem Backup/Deployment Tool") - (description "FSArchiver allows you to save the contents of a file-system to -a compressed archive file. The file-system can be restored on a partition which -has a different size and it can be restored on a different file-system.") - (home-page "http://www.fsarchiver.org/") - (license license:gpl2))) - (define-public udevil (package (name "udevil") diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 1ecc416740..8ac5447466 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2019, 2020 Efraim Flashner +;;; Copyright © 2020 Raghav Gururajan ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,6 +45,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages flex) #:use-module (gnu packages glib) + #:use-module (gnu packages gnupg) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages nfs) @@ -57,6 +59,42 @@ #:use-module (gnu packages valgrind) #:use-module (gnu packages xml)) +(define-public fsarchiver + (package + (name "fsarchiver") + (version "0.8.5") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/fdupoux/fsarchiver.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rvwq5v3rl14bqxjm1ibfapyicf0sa44nw7451v10kx39lp56ylp")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("bzip2" ,bzip2) + ("e2fsprogs" ,e2fsprogs) + ("libgcrypt" ,libgcrypt) + ("lz4" ,lz4) + ("lzo" ,lzo) + ("util-linux" ,util-linux "lib") + ("xz" ,xz) + ("zlib" ,zlib) + ("zstd:lib" ,zstd "lib"))) + (synopsis "Filesystem Backup/Deployment Tool") + (description "FSArchiver allows you to save the contents of a file-system to +a compressed archive file. The file-system can be restored on a partition which +has a different size and it can be restored on a different file-system.") + (home-page "http://www.fsarchiver.org/") + (license license:gpl2))) + (define-public gphotofs (package (name "gphotofs") -- cgit v1.2.3 From 0f30fe7ebbf57f6ea0d19be1204aa4b740a2cde4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 May 2020 00:41:34 +0200 Subject: gnu: fsarchiver: Edit synopsis & description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/file-systems.scm (fsarchiver)[synopsis, description]: Fix spelling (file system, lose, …). Edit for grammar and style (‘…allows you to…’). Provide more information about the package. --- gnu/packages/file-systems.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'gnu/packages/file-systems.scm') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 8ac5447466..293322c76b 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -88,10 +88,18 @@ ("xz" ,xz) ("zlib" ,zlib) ("zstd:lib" ,zstd "lib"))) - (synopsis "Filesystem Backup/Deployment Tool") - (description "FSArchiver allows you to save the contents of a file-system to -a compressed archive file. The file-system can be restored on a partition which -has a different size and it can be restored on a different file-system.") + (synopsis "File system back-up, deployment, and migration tool") + (description + "FSArchiver saves the contents of a file system to a compressed archive +file, and restores it to a different file system and/or partition. This +partition can be of a different size than the original and FSArchiver will +create a new file system if none exists. + +All standard file attributes supported by the kernel are preserved, including +file permissions, timestamps, symbolic and hard links, and extended attributes. + +Each file in the archive is protected by a checksum. If part of the archive +is corrupted you'll lose the affected file(s) but not the whole back-up.") (home-page "http://www.fsarchiver.org/") (license license:gpl2))) -- cgit v1.2.3