gnu: linux-libre: Extract common kernel modules into variables.

Deduplicate common default modules in an attempt to clean the module up.

* gnu/packages/linux.scm (pinebook-extra-modules,
arm64-generic-extra-modules): New variables.
(linux-libre-arm64-generic, linux-libre-lts-arm64-generic,
linux-libre-arm64-generic-5.10): Use new variables.

Change-Id: Ia48d6942332e71cadd43decb59d633180b0d3264
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>

gnu/packages/appimage.scm

@@ -19,9 +19,11 @@
 (define-module (gnu packages appimage)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages c)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages file-systems)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages)
   #:use-module (guix build-system gnu)
   #:use-module (guix gexp)
@@ -30,9 +32,9 @@
   #:use-module (guix utils))
 
 (define-public appimage-type2-runtime
-  (let ((revision "0")
+  (let ((revision "1")
         ;; No releases, just the latest commit.
-        (commit "47b665594856b4e8928f8932adcf6d13061d8c30"))
+        (commit "caf24f9f712084686bfc24a70b75e50df0aefb9c"))
     (package
       (name "appimage-type2-runtime")
       (version (git-version "continuous" revision commit))
@@ -44,16 +46,16 @@
                 (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0954crhlbapxis96g1s0vfpf78ybr64zvjalak387ksxj560g44x"))))
+          (base32 "17z0byws3dp375wcyq5xwy5npqy7hslqw21n677dp38z4f940nzv"))))
       (build-system gnu-build-system)
       (arguments
        (list
         #:tests? #f                     ; No tests
         #:make-flags
-        #~(list "-Csrc/runtime" "runtime-fuse3"
+        #~(list "-Csrc/runtime" "runtime"
                 (string-append "CC=" #$(cc-for-target))
                 (string-append
-                 "CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse/"
+                 "CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse3/"
                  " -DGIT_COMMIT='\"" "guix-" #$version "\"'"
                  " -D_FILE_OFFSET_BITS=64"
                  " -static"
@@ -64,17 +66,22 @@
           (ice-9 binary-ports))
         #:phases
         #~(modify-phases %standard-phases
+            (add-after 'unpack 'use-pkgconfig-flags
+              (lambda _
+                (substitute* "src/runtime/Makefile"
+                  (("-lmimalloc")
+                   "$(pkg-config --cflags mimalloc)"))))
             (delete 'configure)
             (replace 'install
               (lambda _
-                (install-file "src/runtime/runtime-fuse3"
+                (install-file "src/runtime/runtime"
                               (string-append #$output "/bin"))))
             ;; Must be after all elf reliant phases.  Used to identify the
             ;; executable as an AppImage as per the specification.
             (add-after 'make-dynamic-linker-cache 'set-magic-bytes
               (lambda _
                 (let ((port (open (string-append #$output
-                                                 "/bin/runtime-fuse3")
+                                                 "/bin/runtime")
                                   (logior O_WRONLY))))
                   (seek port 8 SEEK_SET)
                   (put-bytevector port #vu8(#x41 #x49 #x02))
@@ -84,9 +91,12 @@
               (this-package-input "fuse")
               (gexp-input (this-package-input "zstd") "static")
               (gexp-input (this-package-input "zlib") "static"))))
+      (native-inputs (list pkg-config))
       ;; Only needed at build time.
-      (inputs (list squashfuse-for-appimage
-                    fuse-for-appimage
+      (inputs (list `(,fuse "out")
+                    `(,fuse "static")
+                    mimalloc
+                    squashfuse-for-appimage
                     `(,zstd "static")
                     `(,zlib "static")))
       (synopsis "Runtime for executing AppImages")

gnu/packages/emacs-xyz.scm

@@ -39440,10 +39440,16 @@ user interfaces for various built-in modes.")
               (make-file-writable "calibredb-core.el")
               (let ((calibredb (search-input-file inputs "/bin/calibredb"))
                     (fetch-ebook-metadata
-                     (search-input-file inputs "/bin/fetch-ebook-metadata")))
+                     (search-input-file inputs "/bin/fetch-ebook-metadata"))
+                    (ebook-convert
+                     (search-input-file inputs "/bin/ebook-convert"))
+                    (calibre-debug
+                     (search-input-file inputs "/bin/calibre-debug")))
                 (emacs-substitute-variables "calibredb-core.el"
                   ("calibredb-fetch-metadata-program" fetch-ebook-metadata)
-                  ("calibredb-program" calibredb))))))))
+                  ("calibredb-program" calibredb)
+                  ("calibredb-convert-program" ebook-convert)
+                  ("calibredb-debug-program" calibre-debug))))))))
     (inputs
      (list calibre))
     (propagated-inputs

gnu/packages/engineering.scm

@@ -50,6 +50,7 @@
 ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2026 Daniel Khodabakhsh <d@niel.khodabakh.sh>
 ;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
+;;; Copyright © 2026 Brent Wedderburn <mb@bean.za.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -253,13 +254,21 @@ their devices.")
           (replace 'build (assoc-ref gnu:%standard-phases 'build))
           (replace 'check (assoc-ref gnu:%standard-phases 'check))
           (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((bin   (string-append #$output "/bin"))
-                    (share (string-append #$output "/share/librecad")))
+            (lambda _
+              (let* ((bin (string-append #$output "/bin"))
+                     (share (string-append #$output "/share"))
+                     (apps (string-append share "/applications"))
+                     (icons (string-append share "/icons/hicolor/128x128/apps")))
                 (mkdir-p bin)
                 (install-file "unix/librecad" bin)
                 (mkdir-p share)
-                (copy-recursively "unix/resources" share)))))))
+                (copy-recursively "unix/resources"
+                                  (string-append share "/librecad"))
+                (mkdir-p apps)
+                (install-file "desktop/librecad.desktop" apps)
+                (mkdir-p icons)
+                (copy-file "librecad/res/main/librecad.png"
+                           (string-append icons "/librecad.png"))))))))
     (inputs
      (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5))
     (native-inputs

gnu/packages/file-systems.scm

@@ -2202,7 +2202,7 @@ while working with large number of files.")
 (define-public squashfuse
   (package
     (name "squashfuse")
-    (version "0.1.105")
+    (version "0.6.1")
     (source
      (origin
        (method git-fetch)
@@ -2211,7 +2211,7 @@ while working with large number of files.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224"))))
+        (base32 "16ds2xlk6hb5cggi6di8s0aalir3mrx7rk24rw5daad1xw4dbq0y"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -2249,7 +2249,8 @@ memory-efficient.")
                  (install-file "fuseprivate.h"
                                (string-append #$output
                                               "/include/squashfuse/")))))))))
-    (inputs (list fuse-for-appimage
+    (inputs (list `(,fuse "out")
+                  `(,fuse "static")
                   `(,zstd "lib")
                   `(,zstd "static")
                   `(,zlib "out")

gnu/packages/guile-xyz.scm

@@ -7654,8 +7654,8 @@ is an attempt to combine both into something useful.")
       (license license:asl2.0))))
 
 (define-public guile-knots
-  (let ((commit "cb5ec50b341f603e9d129152b45e47cf008ea126")
-        (revision "31"))
+  (let ((commit "d79284b4715efc347b22d510c3e3134a0c584b17")
+        (revision "32"))
     (package
     (name "guile-knots")
     (version (git-version "0" revision commit))
@@ -7666,7 +7666,7 @@ is an attempt to combine both into something useful.")
                     (commit commit)))
               (sha256
                (base32
-                "08gcbyw7kvhk568a30kimhn37m9mygpxhswb294n1141ddmhjchh"))
+                "0i87jc3dznw6pdib0yy49d8066c1jvwp2m01xi92amx45dkl8ixc"))
               (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments

gnu/packages/linux.scm

@@ -531,7 +531,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; The current "stable" kernels. That is, the most recently released major
 ;; versions that are still supported upstream.
 
-(define-public linux-libre-6.19-version "6.19.11")
+(define-public linux-libre-6.19-version "6.19.12")
 (define-public linux-libre-6.19-gnu-revision "gnu")
 (define deblob-scripts-6.19
   (linux-libre-deblob-scripts
@@ -541,12 +541,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "05jpciyypvmy6byaxjl49b1fvzxcnlhknf0xabrdj5152iznrzkh")))
 (define-public linux-libre-6.19-pristine-source
   (let ((version linux-libre-6.19-version)
-        (hash (base32 "16ymkc5r3hw05z7l7ih3qw406qlszz1l7b4g5yz0hv15ddxrs0r0")))
+        (hash (base32 "1md8b270pdyk9d8cq0qyr8qmymcijmj3gc39nn394wpr0l94yp6f")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.19)))
 
-(define-public linux-libre-6.18-version "6.18.21")
+(define-public linux-libre-6.18-version "6.18.22")
 (define-public linux-libre-6.18-gnu-revision "gnu")
 (define deblob-scripts-6.18
   (linux-libre-deblob-scripts
@@ -556,7 +556,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "0qlih8w8wg4v5cwbmd34rbhb6mjgbx69i9rx3s2vxw7h42q9l0ai")))
 (define-public linux-libre-6.18-pristine-source
   (let ((version linux-libre-6.18-version)
-        (hash (base32 "0ks735y6jq4yy3jaicjsj4dn4n3kk2skf9dqh9dyifipn57j2f0w")))
+        (hash (base32 "0nazlm6j5blyd4qgl0z6xc3qk00vz3cfvx5mqv18awv5ygx94g52")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.18)))
@@ -565,7 +565,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 ;; Here are the support timelines:
 ;; <https://www.kernel.org/category/releases.html>
 
-(define-public linux-libre-6.12-version "6.12.80")
+(define-public linux-libre-6.12-version "6.12.81")
 (define-public linux-libre-6.12-gnu-revision "gnu")
 (define deblob-scripts-6.12
   (linux-libre-deblob-scripts
@@ -575,12 +575,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "1x48hpmvajz7v5wn1vdd7l5r14mq4ngzh5npz3pj81z4f1g61i0a")))
 (define-public linux-libre-6.12-pristine-source
   (let ((version linux-libre-6.12-version)
-        (hash (base32 "0lrylj87bb8ky29pbplpncrfhmgqqbq3d49iqgdwv7p7jvc929f9")))
+        (hash (base32 "0iw84bqdbh9dlaqd1bqgldg50riw2b5is7ipqnbp0sll8cv9rc62")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.12)))
 
-(define-public linux-libre-6.6-version "6.6.130")
+(define-public linux-libre-6.6-version "6.6.134")
 (define-public linux-libre-6.6-gnu-revision "gnu")
 (define deblob-scripts-6.6
   (linux-libre-deblob-scripts
@@ -590,12 +590,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "0xp9b2vkrb0g0rn4i33b59rhp4sgh1dbwzk28vwz7kwac6l5rcpi")))
 (define-public linux-libre-6.6-pristine-source
   (let ((version linux-libre-6.6-version)
-        (hash (base32 "139480lyi3if8pd2j3yld5a01lk7113kbcn2kxpzyk29p5kslq14")))
+        (hash (base32 "1grp1wqgzjsk6xyl0nvd2hxlxjj0wgz04x544zkz8srp6rxnjy33")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.6)))
 
-(define-public linux-libre-6.1-version "6.1.167")
+(define-public linux-libre-6.1-version "6.1.168")
 (define-public linux-libre-6.1-gnu-revision "gnu")
 (define deblob-scripts-6.1
   (linux-libre-deblob-scripts
@@ -605,7 +605,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
    (base32 "1w5pfws6l39dpc3lzazs1n6r4m96f6rdf6vb2scy5fhmrd933ldc")))
 (define-public linux-libre-6.1-pristine-source
   (let ((version linux-libre-6.1-version)
-        (hash (base32 "1jwqwp2fg3wdsh9w663rbnbv1rvsvksv1pj4bzns8swp0wy0a618")))
+        (hash (base32 "0vkp75sfnjvfqxjh6gqcx24h2m6qj6xkwlw6b118cja43vjnz1g0")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-6.1)))
@@ -945,7 +945,11 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
     ;; Disable the EFI pstore storage backend to avoid causing
     ;; unrecoverable failures on some EFI systems:
     ;; https://lists.gnu.org/archive/html/help-guix/2025-01/msg00173.html
-    ("CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE" . #t)))
+    ("CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE" . #t)
+    ;; Provide modules for wireguard and netfilter support
+    ("CONFIG_WIREGUARD" . m)
+    ("CONFIG_IP_NF_FILTER" . m)
+    ("CONFIG_NETFILTER_XT_MATCH_ADDRTYPE" . m)))
 
 (define (config->string options)
   (string-join (map (match-lambda
@@ -1290,8 +1294,6 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                      #:extra-version "arm-generic"
                      #:extra-options
                      (append
-                      `(;; needed to fix the RTC on rockchip platforms
-                        ("CONFIG_RTC_DRV_RK808" . #t))
                       (default-extra-linux-options linux-libre-5.10-version))))
 
 (define-public linux-libre-arm-omap2plus
@@ -1302,6 +1304,31 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                      #:defconfig "omap2plus_defconfig"
                      #:extra-version "arm-omap2plus"))
 
+(define pinebook-extra-modules
+  `(;; Pinebook display, battery, charger and usb
+    ("CONFIG_DRM_ANALOGIX_ANX6345" . m)
+    ("CONFIG_CHARGER_AXP20X" . m)
+    ("CONFIG_INPUT_AXP20X_PEK" . m)
+    ("CONFIG_CHARGER_AXP20X" . m)
+    ("CONFIG_BATTERY_AXP20X" . m)
+    ("CONFIG_PINCTRL_AXP209" . m)
+    ("CONFIG_AXP20X_POWER" . m)
+    ("CONFIG_AXP20X_ADC" . m)
+    ;; Pinebook PRO battery and sound support
+    ("CONFIG_BATTERY_CW2015" . m)
+    ("CONFIG_CHARGER_GPIO" . m)
+    ("CONFIG_SND_SOC_ES8316" . m)))
+
+(define arm64-generic-extra-modules
+  (append
+   pinebook-extra-modules
+   `(;; Provide support for ath9k wireless
+     ("CONFIG_ATH9K_HTC" . m)
+     ;; Support Orange Pi R1 Plus LTS ethernet PHY.
+     ("CONFIG_MOTORCOMM_PHY" . m)
+     ;; needed to fix the RTC on rockchip platforms
+     ("CONFIG_RTC_DRV_RK808" . #t))))
+
 (define-public linux-libre-arm64-generic
   (make-linux-libre* linux-libre-version
                      linux-libre-gnu-revision
@@ -1311,25 +1338,7 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                      #:extra-version "arm64-generic"
                      #:extra-options
                      (append
-                      `(;; Provide support for ath9k wireless
-                        ("CONFIG_ATH9K_HTC" . m)
-                        ;; Support Orange Pi R1 Plus LTS ethernet PHY.
-                        ("CONFIG_MOTORCOMM_PHY" . m)
-                        ;; needed to fix the RTC on rockchip platforms
-                        ("CONFIG_RTC_DRV_RK808" . #t)
-                        ;; Pinebook display, battery, charger and usb
-                        ("CONFIG_DRM_ANALOGIX_ANX6345" . m)
-                        ("CONFIG_CHARGER_AXP20X" . m)
-                        ("CONFIG_INPUT_AXP20X_PEK" . m)
-                        ("CONFIG_CHARGER_AXP20X" . m)
-                        ("CONFIG_BATTERY_AXP20X" . m)
-                        ("CONFIG_PINCTRL_AXP209" . m)
-                        ("CONFIG_AXP20X_POWER" . m)
-                        ("CONFIG_AXP20X_ADC" . m)
-                        ;; Pinebook PRO battery and sound support
-                        ("CONFIG_BATTERY_CW2015" . m)
-                        ("CONFIG_CHARGER_GPIO" . m)
-                        ("CONFIG_SND_SOC_ES8316" . m))
+                      arm64-generic-extra-modules
                       (default-extra-linux-options linux-libre-version))))
 
 (define-public linux-libre-lts-arm64-generic
@@ -1347,25 +1356,7 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                          #:extra-version "arm64-generic"
                          #:extra-options
                          (append
-                          `( ;; Provide support for ath9k wireless
-                            ("CONFIG_ATH9K_HTC" . m)
-                            ;; Support Orange Pi R1 Plus LTS ethernet PHY.
-                            ("CONFIG_MOTORCOMM_PHY" . m)
-                            ;; needed to fix the RTC on rockchip platforms
-                            ("CONFIG_RTC_DRV_RK808" . #t)
-                            ;; Pinebook display, battery, charger and usb
-                            ("CONFIG_DRM_ANALOGIX_ANX6345" . m)
-                            ("CONFIG_CHARGER_AXP20X" . m)
-                            ("CONFIG_INPUT_AXP20X_PEK" . m)
-                            ("CONFIG_CHARGER_AXP20X" . m)
-                            ("CONFIG_BATTERY_AXP20X" . m)
-                            ("CONFIG_PINCTRL_AXP209" . m)
-                            ("CONFIG_AXP20X_POWER" . m)
-                            ("CONFIG_AXP20X_ADC" . m)
-                            ;; Pinebook PRO battery and sound support
-                            ("CONFIG_BATTERY_CW2015" . m)
-                            ("CONFIG_CHARGER_GPIO" . m)
-                            ("CONFIG_SND_SOC_ES8316" . m))
+                          arm64-generic-extra-modules
                           (default-extra-linux-options linux-libre-lts-version)))))
 
 (define-public linux-libre-arm64-generic-5.10
@@ -1377,21 +1368,7 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                      #:extra-version "arm64-generic"
                      #:extra-options
                      (append
-                      `(;; needed to fix the RTC on rockchip platforms
-                        ("CONFIG_RTC_DRV_RK808" . #t)
-                        ;; Pinebook display, battery, charger and usb
-                        ("CONFIG_DRM_ANALOGIX_ANX6345" . m)
-                        ("CONFIG_CHARGER_AXP20X" . m)
-                        ("CONFIG_INPUT_AXP20X_PEK" . m)
-                        ("CONFIG_CHARGER_AXP20X" . m)
-                        ("CONFIG_BATTERY_AXP20X" . m)
-                        ("CONFIG_PINCTRL_AXP209" . m)
-                        ("CONFIG_AXP20X_POWER" . m)
-                        ("CONFIG_AXP20X_ADC" . m)
-                        ;; Pinebook PRO battery and sound support
-                        ("CONFIG_BATTERY_CW2015" . m)
-                        ("CONFIG_CHARGER_GPIO" . m)
-                        ("CONFIG_SND_SOC_ES8316" . m))
+                      arm64-generic-extra-modules
                       (default-extra-linux-options linux-libre-5.10-version))))
 
 (define-public linux-libre-arm64-honeycomb
@@ -1453,9 +1430,6 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                         ;; Fixes https://codeberg.org/guix/guix/issues/101
                         ("CONFIG_KEY_DH_OPERATIONS" . #true)
 
-                        ;; For connecting to ci.guix.gnu.org over VPN.
-                        ("CONFIG_WIREGUARD" . m)
-
                         ;; restool support
                         ("CONFIG_FSL_MC_UAPI_SUPPORT" . #t)
                         ("CONFIG_FSL_MC_BUS" . #t)
@@ -1774,8 +1748,6 @@ Linux kernel.  It has been modified to remove all non-free binary blobs.")
                                            ("CONFIG_USB_ETH_RNDIS" . m)
                                            ("CONFIG_USB_ETH_EEM" . m)
                                            ("CONFIG_USB_G_NCM" . m)
-                                           ;; Provide support for wireguard
-                                           ("CONFIG_WIREGUARD" . m)
                                            ;; Provide support for ath9k wireless
                                            ("CONFIG_ATH9K" . m)
                                            ("CONFIG_ATH9K_HTC" . m))
@@ -2088,8 +2060,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
                                            ("CONFIG_USB_ETH_RNDIS" . m)
                                            ("CONFIG_USB_ETH_EEM" . m)
                                            ("CONFIG_USB_G_NCM" . m)
-                                           ;; Provide support for wireguard
-                                           ("CONFIG_WIREGUARD" . m)
                                            ;; Provide support for ath9k wireless
                                            ("CONFIG_ATH9K" . m)
                                            ("CONFIG_ATH9K_HTC" . m))
@@ -2423,8 +2393,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
                                            ("CONFIG_USB_ETH_RNDIS" . m)
                                            ("CONFIG_USB_ETH_EEM" . m)
                                            ("CONFIG_USB_G_NCM" . m)
-                                           ;; Provide support for wireguard
-                                           ("CONFIG_WIREGUARD" . m)
                                            ;; Provide support for ath9k wireless
                                            ("CONFIG_ATH9K" . m)
                                            ("CONFIG_ATH9K_HTC" . m))
@@ -5241,14 +5209,20 @@ or kill them altogether.")
                (base32
                 "0b1jp5gp2gv40gv6cvmv86rcr4l0mdh050qbvnxl0xcwya45qffx"))))
     (build-system meson-build-system)
+    (outputs (list "out" "debug" "static"))
     (inputs
      (list bash-minimal util-linux))
     (arguments
      `(#:configure-flags
        ,#~(list
            (string-append "-Dudevrulesdir=" #$output "/udev/rules.d")
-           "-Duseroot=false")
+           "-Duseroot=false"
+           ;; Build static libraries.
+           "--default-library=both")
        #:tests? #f
+       #:modules ((guix build meson-build-system)
+                  (guix build utils)
+                  (ice-9 ftw))
        #:phases
        ,#~(modify-phases %standard-phases
             (add-after 'unpack 'set-file-names
@@ -5286,7 +5260,20 @@ or kill them altogether.")
                           (string-append #$output "/sbin"))
                   (setenv "UDEV_RULES_PATH"
                           (string-append #$output
-                                         "/lib/udev/rules.d"))))))))
+                                         "/lib/udev/rules.d")))))
+            (add-after 'install 'install-static-libraries
+              (lambda* (#:key outputs #:allow-other-keys)
+                (let ((out (assoc-ref outputs "out"))
+                      (static (assoc-ref outputs "static")))
+                  (mkdir-p (string-append static "/lib"))
+                  (for-each
+                   (lambda (static-library)
+                     (rename-file
+                      (string-append out "/lib/" static-library)
+                      (string-append static "/lib/" static-library)))
+                   (scandir (string-append out "/lib")
+                            (lambda (file-name)
+                              (string-suffix? ".a" file-name))))))))))
     (supported-systems (remove target-hurd? %supported-systems))
     (home-page "https://github.com/libfuse/libfuse")
     (synopsis "Support file systems implemented in user space")
@@ -5357,23 +5344,6 @@ user-space processes.")
                (("-DFUSERMOUNT_DIR=[[:graph:]]+")
                 "-DFUSERMOUNT_DIR=\\\"/var/empty\\\"")))))))))
 
-(define-public fuse-for-appimage
-  (package
-    (inherit fuse)
-    (name "fuse")
-    (version "3.16.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/libfuse/libfuse/releases/"
-                           "download/fuse-" version "/fuse-" version ".tar.gz"))
-       (sha256
-        (base32 "11yfl2w2a445hllyzlakq97n32g06972vxpmh7lpbclnj9fhb5zp"))))
-    (arguments
-     (substitute-keyword-arguments arguments
-       ((#:configure-flags original-flags #~(list))
-        #~(append #$original-flags '("--default-library=static")))))))
-
 (define-public unionfs-fuse
   (package
     (name "unionfs-fuse")

gnu/packages/prolog.scm

@@ -236,7 +236,7 @@ it.")
 (define-public trealla
   (package
     (name "trealla")
-    (version "2.92.21")
+    (version "2.92.25")
     (source
      (origin
        (method git-fetch)
@@ -245,7 +245,7 @@ it.")
           (url "https://github.com/trealla-prolog/trealla")
           (commit (string-append "v" version))))
        (sha256
-        (base32 "1i6jn214098181izf74mq2mzmbq3lkbynhvpp6pfc2svf5z489pp"))
+        (base32 "1asp09g225971fq8n96xh688mk3xrvdj5pd6hvvqc1y1hgimyyr7"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (inputs

gnu/packages/rust-crates.scm

@@ -59964,6 +59964,36 @@
                                 rust-zlib-rs-0.6.3
                                 rust-zmij-1.0.21
                                 rust-zopfli-0.8.3))
+                     (mesa =>           ; TODO: Maintain this automatically.
+                           (list rust-bitflags-2.9.1
+                                 rust-cfg-if-1.0.0
+                                 rust-equivalent-1.0.1
+                                 rust-errno-0.3.12
+                                 rust-hashbrown-0.14.1
+                                 rust-indexmap-2.2.6
+                                 rust-libc-0.2.171
+                                 rust-log-0.4.27
+                                 rust-once-cell-1.8.0
+                                 rust-paste-1.0.14
+                                 rust-pest-2.8.0
+                                 rust-pest-derive-2.8.0
+                                 rust-pest-generator-2.8.0
+                                 rust-pest-meta-2.8.0
+                                 rust-proc-macro2-1.0.86
+                                 rust-quote-1.0.35
+                                 rust-remain-0.2.12
+                                 rust-roxmltree-0.20.0
+                                 rust-rustc-hash-2.1.1
+                                 rust-rustix-1.1.2
+                                 rust-syn-2.0.87
+                                 rust-thiserror-2.0.11
+                                 rust-thiserror-impl-2.0.11
+                                 rust-ucd-trie-0.1.6
+                                 rust-unicode-ident-1.0.12-unpatched
+                                 rust-windows-link-0.2.0
+                                 rust-windows-sys-0.61.1
+                                 rust-zerocopy-0.8.13
+                                 rust-zerocopy-derive-0.8.13))
                      (mitm-cache =>
                                  (list rust-adler2-2.0.1
                                   rust-aho-corasick-1.1.4
@@ -60231,36 +60261,6 @@
                                   rust-zstd-0.13.3
                                   rust-zstd-safe-7.2.4
                                   rust-zstd-sys-2.0.16+zstd.1.5.7))
-                     (mesa =>           ; TODO: Maintain this automatically.
-                           (list rust-bitflags-2.9.1
-                                 rust-cfg-if-1.0.0
-                                 rust-equivalent-1.0.1
-                                 rust-errno-0.3.12
-                                 rust-hashbrown-0.14.1
-                                 rust-indexmap-2.2.6
-                                 rust-libc-0.2.171
-                                 rust-log-0.4.27
-                                 rust-once-cell-1.8.0
-                                 rust-paste-1.0.14
-                                 rust-pest-2.8.0
-                                 rust-pest-derive-2.8.0
-                                 rust-pest-generator-2.8.0
-                                 rust-pest-meta-2.8.0
-                                 rust-proc-macro2-1.0.86
-                                 rust-quote-1.0.35
-                                 rust-remain-0.2.12
-                                 rust-roxmltree-0.20.0
-                                 rust-rustc-hash-2.1.1
-                                 rust-rustix-1.1.2
-                                 rust-syn-2.0.87
-                                 rust-thiserror-2.0.11
-                                 rust-thiserror-impl-2.0.11
-                                 rust-ucd-trie-0.1.6
-                                 rust-unicode-ident-1.0.12-unpatched
-                                 rust-windows-link-0.2.0
-                                 rust-windows-sys-0.61.1
-                                 rust-zerocopy-0.8.13
-                                 rust-zerocopy-derive-0.8.13))
                      (mollysocket =>
                                   (list rust-ahash-0.8.12
                                    rust-aho-corasick-1.1.3

guix/scripts/pack.scm

@@ -11,7 +11,7 @@
 ;;; Copyright © 2023 Graham James Addis <graham@addis.org.uk>
 ;;; Copyright © 2023 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2024 Sebastian Dümcke <code@sam-d.com>
-;;; Copyright © 2024 Noé Lopez <noelopez@free.fr>
+;;; Copyright © 2024-2025 Noé Lopez <noelopez@free.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -81,7 +81,9 @@
             self-contained-appimage
 
             %formats
-            guix-pack))
+            guix-pack
+
+            wrapped-manifest))
 
 ;;; Commentary:
 
@@ -999,7 +1001,7 @@ added to the pack."
       (warning (G_ "AppImages should be built with the --relocatable flag~%"))))
 
   (define runtime-package appimage-type2-runtime)
-  (define runtime-path "bin/runtime-fuse3")
+  (define runtime-path "bin/runtime")
   (define %valid-compressors '("gzip" "zstd"))
 
   (let ((compressor-name (compressor-name compressor)))
@@ -1397,6 +1399,13 @@ libfakechroot.so and related ld.so machinery as a fallback."
                          (apply wrapped-manifest-entry entry args))
                        (manifest-entry-dependencies entry)))))
 
+(define* (wrapped-manifest manifest #:rest args)
+  "Return the MANIFEST with its entries wrapped such that they are
+relocatable. Extra arguments are passed to wrapped-package."
+  (map-manifest-entries
+   (lambda (entry) (apply wrapped-manifest-entry entry args))
+   manifest))
+
 
 ;;;
 ;;; Command-line options.
@@ -1795,9 +1804,7 @@ Create a bundle of PACKAGE.\n"))
                                   ;; Note: We cannot honor '--bootstrap' here because
                                   ;; 'glibc-bootstrap' lacks 'libc.a'.
                                   (if relocatable?
-                                      (map-manifest-entries
-                                       (cut wrapped-manifest-entry <> #:proot? proot?)
-                                       manifest)
+                                      (wrapped-manifest manifest #:proot? proot?)
                                       manifest)))
                    (pack-format (assoc-ref opts 'format))
                    (extra-options (match pack-format

tests/pack.scm

@@ -3,7 +3,7 @@
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2023 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2024 Noé Lopez <noelopez@free.fr>
+;;; Copyright © 2024-2025 Noé Lopez <noelopez@free.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -337,11 +337,13 @@
     (mlet* %store-monad
         ((guile   (set-guile-for-build (default-guile)))
          (profile -> (profile
-                      ;; When using '--appimage-extract-and-run', the dynamic
-                      ;; linker is necessary, hence glibc below.
-                      (content (packages->manifest (list hello glibc)))
-                      (hooks '())
-                      (locales? #f)))
+                       ;; When using '--appimage-extract-and-run', the dynamic
+                       ;; linker is necessary, hence glibc below.
+                       (content (wrapped-manifest
+                                 (packages->manifest (list hello glibc))))
+                       (relative-symlinks? #t)
+                       (hooks '())
+                       (locales? #f)))
          (image   (self-contained-appimage "hello-appimage" profile
                                            #:entry-point "bin/hello"
                                            #:extra-options
@@ -369,11 +371,13 @@
     (mlet* %store-monad
         ((guile   (set-guile-for-build (default-guile)))
          (profile -> (profile
-                      ;; When using '--appimage-extract-and-run', the dynamic
-                      ;; linker is necessary, hence glibc below.
-                      (content (packages->manifest (list guile-3.0 glibc)))
-                      (hooks '())
-                      (locales? #f)))
+                       ;; When using '--appimage-extract-and-run', the dynamic
+                       ;; linker is necessary, hence glibc below.
+                       (content (wrapped-manifest
+                                 (packages->manifest (list guile-3.0 glibc))))
+                       (relative-symlinks? #t)
+                       (hooks '())
+                       (locales? #f)))
          (image   (self-contained-appimage "guile-appimage" profile
                                            #:entry-point "bin/guile"
                                            #:localstatedir? #t