From bfb480e76f7968f8e39e37e64681b0fd062edb1e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: qemu: Update to 7.2.4. * gnu/packages/virtualization.scm (qemu): Update to 7.2.4. --- gnu/packages/virtualization.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3f6c32f390..729c61de8d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -160,15 +160,14 @@ (define (qemu-patch commit file-name sha256-bv) (define-public qemu (package (name "qemu") - (version "7.2.1") + (version "7.2.4") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 - (base32 - "0fypm8blv0la17vvlx6h38nhq2rpavflr9i9zsjl6ylxryd6k1cc")) + (base32 "0795l8xsy67fnh4mbdz40jm880iisd7q6d7ly6nfzpac3gjr8zyf")) (patches (search-patches "qemu-build-info-manual.patch" "qemu-disable-aarch64-migration-test.patch" "qemu-fix-agent-paths.patch")) -- cgit v1.2.3 From ca133a7c4d8bf07618b17a614b872fb8538da77b Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Tue, 25 Jul 2023 14:42:45 -0400 Subject: gnu: Add rvvm. * gnu/packages/virtualization.scm (rvvm): New variable. Co-authored-by: Efraim Flashner Signed-off-by: Efraim Flashner --- gnu/packages/virtualization.scm | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 729c61de8d..db7df83524 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2022 Ekaitz Zarraga ;;; Copyright © 2022 Arun Isaac ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2023 Juliana Sims ;;; ;;; This file is part of GNU Guix. ;;; @@ -1126,6 +1127,57 @@ (define-public ganeti-instance-debootstrap Debian or a derivative using @command{debootstrap}.") (license license:gpl2+))) +(define-public rvvm + (package + (name "rvvm") + (version "0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LekKit/RVVM") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ldabcrmpa044bahpqa6ymwbhhwy69slh77f0m3421sq6j50l06p")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + ;; See src/rvjit/rvjit.h for list of architectures. + #~(#$@(if (or (target-x86?) + (target-arm?)) + #~'() + #~(list "-DRVVM_USE_JIT=NO"))) + #:modules `((srfi srfi-26) + (guix build utils) + (guix build cmake-build-system)) + #:phases + #~(modify-phases %standard-phases + ;; Install phase inspired by the Makefile. + (replace 'install + (lambda _ + (let ((src "../source/src/") + (incl (string-append #$output "/include/rvvm/"))) + (install-file "rvvm" (string-append #$output "/bin")) + (for-each + (cut install-file <> (string-append #$output "/lib")) + (find-files "." "\\.(so|a)$")) + (install-file (string-append src "rvvmlib.h") incl) + (for-each + (cut install-file <> (string-append incl "devices")) + (find-files (string-append src "devices") "\\.h$")))))) + #:tests? #f)) ; no tests + (home-page "https://github.com/LekKit/RVVM") + (synopsis "RISC-V virtual machine") + (description + "RVVM is a RISC-V CPU and system software implementation written in C. It +supports the entire RV64GC ISA, and it passes compliance tests for both RV64 and +RV32. OpenSBI, U-Boot, and custom firmwares boot and execute properly. It is +capable of running Linux, FreeBSD, OpenBSD, Haiku, and other OSes. Furthermore, +it emulates a variety of hardware and peripherals.") + (license (list license:gpl3+ license:mpl2.0)))) + (define-public spike (package (name "spike") -- cgit v1.2.3 From 789f7e9a3d37135d22d0a84c987fe3877131fd06 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: fuse@3: Bind to default FUSE variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (fuse): Rename this… (fuse-2): …to this, and… (fuse-3): …rename this… (fuse): …to this! (fuse-static): Rename this… (fuse-2-static): …to this. Adjust all users. --- gnu/packages/admin.scm | 2 +- gnu/packages/android.scm | 2 +- gnu/packages/backup.scm | 2 +- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/bootloaders.scm | 4 ++-- gnu/packages/build-tools.scm | 2 +- gnu/packages/crypto.scm | 4 ++-- gnu/packages/file-systems.scm | 28 ++++++++++++++-------------- gnu/packages/freedesktop.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/libusb.scm | 2 +- gnu/packages/linux.scm | 30 +++++++++++++++--------------- gnu/packages/package-management.scm | 4 ++-- gnu/packages/python-xyz.scm | 16 +++++++--------- gnu/packages/storage.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/virtualization.scm | 4 ++-- gnu/system.scm | 2 +- 19 files changed, 56 insertions(+), 58 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ec32041055..f601b8a8b4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2980,7 +2980,7 @@ (define-public debops (inputs (list ansible encfs - fuse + fuse-2 util-linux ;; for umount findutils gnupg diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index b9b8b89208..32c295f9e4 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -1291,7 +1291,7 @@ (define-public android-file-transfer (build-system cmake-build-system) (arguments (list #:tests? #f)) ;there are no tests - (inputs (list qtbase-5 fuse-3 libxkbcommon)) + (inputs (list qtbase-5 fuse libxkbcommon)) (native-inputs (list qttools-5 openssl readline)) (home-page "https://whoozle.github.io/android-file-transfer-linux/") (synopsis "MTP client for Android devices") diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index c8a1b388de..d484c34826 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -780,7 +780,7 @@ (define-public wimlib (native-inputs (list pkg-config)) (inputs - (list fuse-3 libxml2 ntfs-3g openssl)) + (list fuse libxml2 ntfs-3g openssl)) (arguments `(#:configure-flags (list "--disable-static" diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 864c200707..34e8565788 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8713,7 +8713,7 @@ (define-public sra-tools (list ngs-sdk ncbi-vdb file - fuse + fuse-2 hdf5-1.10 libxml2 zlib diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 38eb1d104f..069d02b52c 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -215,8 +215,8 @@ (define-public grub ;; file system will be readable by GRUB without rebooting. ,@(if (member (or (%current-target-system) (%current-system)) - (package-supported-systems fuse)) - `(("fuse" ,fuse)) + (package-supported-systems fuse-2)) + `(("fuse" ,fuse-2)) '()) ("freetype" ,freetype) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 192b7faba9..a365cca849 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -605,7 +605,7 @@ (define-public tup (display "au BufNewFile,BufRead Tupfile,*.tup setf tup"))) #t)))))) (inputs - (list fuse-3 pcre + (list fuse pcre `(,pcre "bin") ; pcre-config sqlite)) (native-inputs diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 0f1e70f4dc..07e718feaf 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -333,7 +333,7 @@ (define-public encfs ("googletest-source" ,(package-source googletest)) ("perl" ,perl))) (inputs - (list attr fuse openssl-1.1 tinyxml2)) + (list attr fuse-2 openssl-1.1 tinyxml2)) (arguments `(#:configure-flags (list "-DUSE_INTERNAL_TINYXML=OFF") #:phases @@ -1532,7 +1532,7 @@ (define-public cryfs (native-inputs (list pkg-config python-wrapper)) (inputs - (list boost curl fuse range-v3 spdlog)) + (list boost curl fuse-2 range-v3 spdlog)) (home-page "https://www.cryfs.org/") (synopsis "Encrypted FUSE filesystem for the cloud") (description "CryFS encrypts your files, so you can safely store them anywhere. diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index a76e6c74c1..8d9ed917aa 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -198,7 +198,7 @@ (define-public bindfs ;; ("which" ,which) (list pkg-config)) (inputs - (list fuse)) + (list fuse-2)) (home-page "https://bindfs.org") (synopsis "Bind mount a directory and alter permission bits") (description @@ -275,7 +275,7 @@ (define-public avfs (arguments '(#:configure-flags '("--enable-library" "--enable-fuse"))) (native-inputs (list pkg-config)) - (inputs (list xz fuse)) + (inputs (list xz fuse-2)) (synopsis "Virtual file system that allows browsing of compressed files") (description "AVFS is a FUSE-based filesystem that allows browsing of compressed @@ -565,7 +565,7 @@ (define-public gphotofs (native-inputs (list pkg-config)) (inputs - (list fuse glib libgphoto2)) + (list fuse-2 glib libgphoto2)) (synopsis "Virtual file system for libgphoto2 using FUSE") (description "GPhotoFS is a FUSE file system module to mount your camera as a file system on Linux. This allow using your camera with any tool able to read @@ -756,7 +756,7 @@ (define-public httpfs2 (native-inputs (list asciidoc docbook-xml libxml2 libxslt pkg-config)) (inputs - (list fuse gnutls)) + (list fuse-2 gnutls)) (arguments (list #:phases #~(modify-phases %standard-phases @@ -921,7 +921,7 @@ (define-public disorderfs (native-inputs (list pkg-config)) (inputs - (list fuse attr)) + (list fuse-2 attr)) (arguments `(#:phases (modify-phases %standard-phases (delete 'configure)) ; no configure script @@ -983,7 +983,7 @@ (define-public glusterfs ("cmocka" ,cmocka))) (inputs `(("acl" ,acl) - ("fuse" ,fuse) + ("fuse" ,fuse-2) ("openssl" ,openssl) ("liburcu" ,liburcu) ("libuuid" ,util-linux "lib") @@ -1030,7 +1030,7 @@ (define-public curlftpfs (("4426192") "12814800")) #t))))) (inputs - (list curl glib fuse)) + (list curl glib fuse-2)) (native-inputs (list pkg-config)) (home-page "https://curlftpfs.sourceforge.net/") @@ -1178,7 +1178,7 @@ (define-public apfs-fuse (arguments `(#:tests? #f ; No test suite #:configure-flags - '("-DUSE_FUSE3=OFF") ; FUSE 3 is not packaged yet. + '("-DUSE_FUSE3=OFF") #:phases (modify-phases %standard-phases ;; No 'install' target in CMakeLists.txt @@ -1196,7 +1196,7 @@ (define-public apfs-fuse (install-file "../source/README.md" doc) #t)))))) (inputs - (list bzip2 fuse zlib)) + (list bzip2 fuse-2 zlib)) (synopsis "Read-only FUSE driver for the APFS file system") (description "APFS-FUSE is a read-only FUSE driver for the @dfn{Apple File System} (APFS). It is currently in an experimental state — it may not be able @@ -1614,7 +1614,7 @@ (define-public mergerfs (("/sbin") "$(EXEC_PREFIX)/sbin") (("chown") "true") ; disallowed in the build environment (("strip") "true")) ; breaks cross-compilation - ;; These were copied from the fuse package. + ;; These were copied from the fuse-2 package. (substitute* '("libfuse/lib/mount_util.c" "libfuse/util/mount_util.c") (("/bin/(u?)mount" _ maybe-u) @@ -1811,7 +1811,7 @@ (define-public rewritefs (native-inputs (list pkg-config)) (inputs - (list fuse pcre)) + (list fuse-2 pcre)) (home-page "https://github.com/sloonz/rewritefs") (synopsis "FUSE file system that changes particular file names") (description @@ -1839,7 +1839,7 @@ (define-public squashfuse (base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool pkg-config)) - (inputs (list attr fuse xz zlib `(,zstd "lib"))) + (inputs (list attr fuse-2 xz zlib `(,zstd "lib"))) (home-page "https://github.com/vasi/squashfuse") (synopsis "Fuse filesystem to mount squashfs archives") (description @@ -1935,7 +1935,7 @@ (define-public fuse-overlayfs (native-inputs (list automake autoconf libtool pkg-config)) (inputs - (list fuse-3)) + (list fuse)) (home-page "https://github.com/containers/fuse-overlayfs") (synopsis "FUSE implementation of overlayfs") (description "This package provides an implementation of overlay+shiftfs @@ -2056,7 +2056,7 @@ (define-public dwarfs boost double-conversion fmt - fuse-3 + fuse gflags jemalloc libarchive diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 3bfc8b33ae..60e1e18ade 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2798,7 +2798,7 @@ (define-public xdg-desktop-portal ("dbus" ,dbus) ("geoclue" ,geoclue) ("pipewire" ,pipewire) - ("fuse" ,fuse-3))) + ("fuse" ,fuse))) (arguments `(#:configure-flags (list "--with-systemd=no") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 11085ecc80..b09d9b4afd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7008,7 +7008,7 @@ (define-public gvfs docbook-xsl dbus elogind - fuse-3 + fuse gcr glib gnome-online-accounts diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 5e8e69487e..8ad24931b2 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -507,7 +507,7 @@ (define-public kio-fuse (invoke "dbus-launch" "ctest" "-E" "(fileopstest-cache|fileopstest-filejob)"))))))) (native-inputs (list dbus extra-cmake-modules pkg-config)) - (inputs (list fuse-3 kio kcoreaddons qtbase-5)) + (inputs (list fuse kio kcoreaddons qtbase-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "FUSE Interface for KIO") (description "This package provides FUSE Interface for KIO.") diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 13090d30ab..22803fa021 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -523,7 +523,7 @@ (define-public ifuse (base32 "11wdv44qwia77sh38n36809ysaib52rwd4fvqwb5ybsbz4p70l1m")))) (inputs - (list fuse libimobiledevice)) + (list fuse-2 libimobiledevice)) (native-inputs (list pkg-config)) (build-system gnu-build-system) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bfe6f53386..ea0a923f67 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2309,7 +2309,7 @@ (define-public dislocker (build-system cmake-build-system) (arguments '(#:tests? #f)) ;no test suite - (inputs (list fuse mbedtls-apache)) + (inputs (list fuse-2 mbedtls-apache)) (synopsis "FUSE driver to read/write Windows BitLocker drives") (description "This package provides means to to read BitLocker encrypted @@ -3692,7 +3692,7 @@ (define-public iotop or kill them altogether.") (license license:gpl2+))) -(define-public fuse +(define-public fuse-2 (package (name "fuse") (version "2.9.9") @@ -3762,9 +3762,9 @@ (define-public fuse (license (list license:lgpl2.1 ;library license:gpl2+)))) ;command-line utilities -(define-public fuse-3 +(define-public fuse (package - (inherit fuse) + (inherit fuse-2) (name "fuse") (version "3.10.5") (source (origin @@ -3838,7 +3838,7 @@ (define-public unionfs-fuse (build-system cmake-build-system) (native-inputs (list python)) - (inputs (list fuse)) + (inputs (list fuse-2)) (arguments ;; The tests were never actually run ("collected 0 items"), but in recent ;; versions of pytest that causes an error. @@ -3852,10 +3852,10 @@ (define-public unionfs-fuse UnionFS-FUSE additionally supports copy-on-write.") (license license:bsd-3))) -(define fuse-static - (package (inherit fuse) +(define fuse-2-static + (package (inherit fuse-2) (name "fuse-static") - (source (origin (inherit (package-source fuse)) + (source (origin (inherit (package-source fuse-2)) (modules '((guix build utils))) (snippet '(begin @@ -3903,7 +3903,7 @@ (define-public unionfs-fuse/static ;; we don't need it, remove it. (delete-file (string-append out "/bin/unionfsctl")) #t)))))) - (inputs `(("fuse" ,fuse-static))))) + (inputs `(("fuse" ,fuse-2-static))))) (define-public sshfs (package @@ -3922,7 +3922,7 @@ (define-public sshfs ;; XXX: tests are skipped: FUSE kernel module does not seem to be loaded '(#:tests? #f)) (inputs - (list fuse-3 glib)) + (list fuse glib)) (native-inputs (list pkg-config ;; man page @@ -3953,7 +3953,7 @@ (define-public archivemount (sha256 (base32 "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5")))) (build-system gnu-build-system) - (inputs (list fuse libarchive)) + (inputs (list fuse-2 libarchive)) (native-inputs (list pkg-config)) (home-page "https://www.cybernoia.de/software/archivemount.html") (synopsis "Tool for mounting archive files with FUSE") @@ -5913,7 +5913,7 @@ (define-public fuse-exfat (native-inputs (list pkg-config)) (inputs - (list fuse)) + (list fuse-2)) (home-page "https://github.com/relan/exfat") (synopsis "Mount exFAT file systems") (description @@ -5936,7 +5936,7 @@ (define-public fuseiso (native-inputs (list pkg-config)) (inputs - (list fuse glib zlib)) + (list fuse-2 glib zlib)) (home-page "https://sourceforge.net/projects/fuseiso/") (synopsis "Mount ISO file system images") (description @@ -6611,7 +6611,7 @@ (define-public ntfs-3g "@sbindir@")))))) (build-system gnu-build-system) (inputs (list util-linux ; libuuid - fuse)) + fuse-2)) (native-inputs (list pkg-config)) (arguments '(#:configure-flags (list "--disable-static" @@ -8472,7 +8472,7 @@ (define-public jmtpfs "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1")))) (build-system gnu-build-system) (inputs - (list file fuse libmtp)) + (list file fuse-2 libmtp)) (native-inputs (list pkg-config)) (home-page "https://github.com/JasonFerrara/jmtpfs") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b833ce29e7..dacd4433d2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1863,7 +1863,7 @@ (define-public libostree docbook-xml docbook-xsl e2fsprogs - fuse + fuse-2 glib gpgme libarchive @@ -1964,7 +1964,7 @@ (define-public flatpak bubblewrap curl dconf - fuse + fuse-2 gdk-pixbuf gpgme json-glib diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index db3e69fb45..a59879cdf6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13306,7 +13306,7 @@ (define-public python-llfuse "1jaf790rsxvz3hs9fbr3hrnmg0xzl6a2bqfa10bbbsjsdbcpk762")))) (build-system python-build-system) (inputs - (list fuse attr)) + (list fuse-2 attr)) (native-inputs (list pkg-config python-pytest)) (synopsis "Python bindings for FUSE") @@ -24387,10 +24387,9 @@ (define-public python-fusepy (let ((fuse (assoc-ref inputs "fuse"))) (substitute* "fuse.py" (("find_library\\('fuse'\\)") - (string-append "'" fuse "/lib/libfuse.so'"))) - #t)))))) + (string-append "'" fuse "/lib/libfuse.so'"))))))))) (propagated-inputs - (list fuse)) + (list fuse-2)) (home-page "https://github.com/fusepy/fusepy") (synopsis "Simple ctypes bindings for FUSE") (description "Python module that provides a simple interface to FUSE and @@ -24417,10 +24416,9 @@ (define-public python-fusepyng (let ((fuse (assoc-ref inputs "fuse"))) (substitute* "fusepyng.py" (("os.environ.get\\('FUSE_LIBRARY_PATH'\\)") - (string-append "\"" fuse "/lib/libfuse.so\"")))) - #t))))) + (string-append "\"" fuse "/lib/libfuse.so\""))))))))) (inputs - (list fuse)) + (list fuse-2)) (propagated-inputs (list python-paramiko)) (home-page "https://github.com/rianhunter/fusepyng") @@ -31962,10 +31960,10 @@ (define-public python-pyfuse3 (base32 "0cvybynv9igssfa4l13q09gb6m7afmwk34wsbq8jk14sqpd4dl92")))) (build-system python-build-system) (native-inputs (list pkg-config)) - (inputs (list fuse-3)) + (inputs (list fuse)) (propagated-inputs (list python-pytest-trio)) (home-page "https://github.com/libfuse/pyfuse3") - (synopsis "Python bindings FUSE 3") + (synopsis "Python bindings to FUSE 3") (description "This package provides Python 3 bindings for libfuse 3 with async I/O support.") (license license:gpl2+))) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index f9b76b1d38..0dadd0914a 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -222,7 +222,7 @@ (define-public ceph expat fcgi fmt-8 - fuse + fuse-2 icu4c jemalloc keyutils diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 28b5989d6a..8235332cb0 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -546,7 +546,7 @@ (define-public casync acl libselinux eudev - fuse + fuse-2 openssl zlib)) (synopsis "File synchronization and backup system") diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index db7df83524..9372ad4e45 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1325,7 +1325,7 @@ (define-public lxcfs (native-inputs (list autoconf automake libtool pkg-config)) (inputs - (list fuse)) + (list fuse-2)) (build-system gnu-build-system) (synopsis "FUSE-based file system for LXC") (description "LXCFS is a small FUSE file system written with the intention @@ -1499,7 +1499,7 @@ (define-public libvirt (inputs (list acl attr - fuse + fuse-2 libxml2 eudev libpciaccess diff --git a/gnu/system.scm b/gnu/system.scm index 23addf41e9..5598643910 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1244,7 +1244,7 @@ (define %setuid-programs (file-append sudo "/bin/sudo") (file-append sudo "/bin/sudoedit") (file-append fuse "/bin/fusermount") - (file-append fuse-3 "/bin/fusermount3") + (file-append fuse "/bin/fusermount3") ;; To allow mounts with the "user" option, "mount" and "umount" must ;; be setuid-root. -- cgit v1.2.3 From 856f91d9b38c6590170a628dc67283f0784e1dd0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: lxcfs: Fix build. * gnu/packages/virtualization.scm (lxcfs)[arguments]: Replace the default 'bootstrap phase. --- gnu/packages/virtualization.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9372ad4e45..1eacdcc2fe 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1321,7 +1321,13 @@ (define-public lxcfs (base32 "02cgzh97cgxh9iyf7gkn5ikdc0sfzqfjj6al0hikdf9rbwcscqwd")))) (arguments - '(#:configure-flags '("--localstatedir=/var"))) + '(#:configure-flags '("--localstatedir=/var") + #:phases + (modify-phases %standard-phases + (replace 'bootstrap + ;; Work around missing interpreter shebang. + (lambda _ + (invoke "bash" "bootstrap.sh")))))) (native-inputs (list autoconf automake libtool pkg-config)) (inputs -- cgit v1.2.3 From 6bf4939ebf89878dfca0837983e527a4d80ba382 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: lxcfs: Use G-expressions. * gnu/packages/virtualization.scm (lxcfs)[arguments]: Rewrite as G-expressions. --- gnu/packages/virtualization.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1eacdcc2fe..018a402605 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1321,13 +1321,15 @@ (define-public lxcfs (base32 "02cgzh97cgxh9iyf7gkn5ikdc0sfzqfjj6al0hikdf9rbwcscqwd")))) (arguments - '(#:configure-flags '("--localstatedir=/var") - #:phases - (modify-phases %standard-phases - (replace 'bootstrap - ;; Work around missing interpreter shebang. - (lambda _ - (invoke "bash" "bootstrap.sh")))))) + (list + #:configure-flags + #~(list "--localstatedir=/var") + #:phases + #~(modify-phases %standard-phases + (replace 'bootstrap + ;; Work around missing interpreter shebang. + (lambda _ + (invoke "bash" "bootstrap.sh")))))) (native-inputs (list autoconf automake libtool pkg-config)) (inputs -- cgit v1.2.3 From 0174d058f20a8bf496199c7cb6384a5e41e52555 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: lxcfs: Update to 5.0.4. * gnu/packages/virtualization.scm (lxcfs): Update to 5.0.4. [build-system]: Switch to Meson. [arguments]: Remove old value. Install System V init scripts. [native-inputs]: Remove autoconf, automake, and libtool. Add help2man, python, and python-jinja2. [inputs]: Upgrade fuse-2 to fuse (3). --- gnu/packages/virtualization.scm | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 018a402605..9556fbc61e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -97,6 +97,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages m4) + #:use-module (gnu packages man) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) @@ -1310,31 +1311,25 @@ (define-public lxc (define-public lxcfs (package (name "lxcfs") - (version "4.0.11") + (version "5.0.4") (home-page "https://github.com/lxc/lxcfs") - (source (origin - (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "lxcfs-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "02cgzh97cgxh9iyf7gkn5ikdc0sfzqfjj6al0hikdf9rbwcscqwd")))) + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "lxcfs-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15cc7kvnln4qqlv22hprfzmq89jbkx7yra730hap8wkvamn33sxy")))) + (build-system meson-build-system) (arguments (list #:configure-flags - #~(list "--localstatedir=/var") - #:phases - #~(modify-phases %standard-phases - (replace 'bootstrap - ;; Work around missing interpreter shebang. - (lambda _ - (invoke "bash" "bootstrap.sh")))))) + #~(list "-Dinit-script=sysvinit"))) ; no ‘none’ option (native-inputs - (list autoconf automake libtool pkg-config)) + (list help2man pkg-config python python-jinja2)) (inputs - (list fuse-2)) - (build-system gnu-build-system) + (list fuse)) (synopsis "FUSE-based file system for LXC") (description "LXCFS is a small FUSE file system written with the intention of making Linux containers feel more like a virtual machine. -- cgit v1.2.3