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: linux-libre: Build wireguard and netfilter modules by default.
2026-04-11 19:10:28 -07:00 · 2026-04-11 19:10:24 -07:00 · 2026-04-11 19:05:24 -07:00 · 2026-04-11 19:05:21 -07:00 · 2026-04-11 19:05:19 -07:00 · 2026-04-11 19:05:15 -07:00
32 changed files with 235 additions and 1378 deletions
@@ -13,7 +13,6 @@ gnu/packages/fluidplug\.scm                        @guix/audio
 gnu/packages/music\.scm                            @guix/audio
 gnu/packages/xiph\.scm                             @guix/audio

-gnu/packages/beam-.+\.scm$                         @guix/beam
 gnu/packages/elixir(-.+|)\.scm$                    @guix/beam
 guix/build/mix-build-system\.scm                   @guix/beam
 guix/build-system/mix\.scm                         @guix/beam
@@ -21,12 +20,7 @@ gnu/packages/erlang(-.+|)\.scm$                    @guix/beam
 guix/build/rebar-build-system\.scm                 @guix/beam
 guix/build-system/rebar\.scm                       @guix/beam
 guix/import/hexpm\.scm                             @guix/beam
-guix/import/mix\.scm                               @guix/beam
-guix/import/mix/mix-lock\.scm                      @guix/beam
 guix/scripts/import/hexpm\.scm                     @guix/beam
-guix/scripts/import/mix\.scm                       @guix/beam
-tests/import/hexpm\.scm                            @guix/beam
-tests/import/mix\.scm                              @guix/beam

 gnu/packages/bioinformatics\.scm                   @guix/bioinformatics

@@ -22,7 +22,6 @@
 # Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
 # Copyright © 2025 Brice Waegeneire <brice@waegenei.re>
 # Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de>
-# Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
 #
 # This file is part of GNU Guix.
 #
@@ -321,8 +320,6 @@ MODULES =					\
  guix/import/launchpad.scm   			\
  guix/import/luanti.scm   			\
  guix/import/minetest.scm   			\
-  guix/import/mix.scm				\
-  guix/import/mix/mix-lock.scm			\
  guix/import/nuget.scm   			\
  guix/import/npm-binary.scm			\
  guix/import/opam.scm				\
@@ -380,7 +377,6 @@ MODULES =					\
  guix/scripts/import/json.scm  		\
  guix/scripts/import/luanti.scm  		\
  guix/scripts/import/minetest.scm  		\
-  guix/scripts/import/mix.scm	  		\
  guix/scripts/import/npm-binary.scm		\
  guix/scripts/import/nuget.scm  		\
  guix/scripts/import/opam.scm			\
@@ -581,7 +577,6 @@ SCM_TESTS =					\
  tests/import/hackage.scm			\
  tests/import/hexpm.scm			\
  tests/import/luanti.scm			\
-  tests/import/mix.scm				\
  tests/import/npm-binary.scm			\
  tests/import/nuget.scm			\
  tests/import/opam.scm				\
@@ -29,7 +29,6 @@ Copyright @copyright{} 2025 45mg@*
 Copyright @copyright{} 2023 Marek Felšöci@*
 Copyright @copyright{} 2023 Konrad Hinsen@*
 Copyright @copyright{} 2023 Philippe Swartvagher@*
-Copyright @copyright{} 2026 Igorj Gorjaĉev@*

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -141,7 +140,6 @@ Programmable and automated package definition
 Packaging Workflows

 * Packaging Rust Crates::
-* Packaging Elixir Applications::

 Packaging Rust Crates

@@ -1634,7 +1632,6 @@ systems, serving as extensions to the concise packaging guidelines

@menu
 * Packaging Rust Crates::
-* Packaging Elixir Applications::
@end menu

@node Packaging Rust Crates
@@ -1990,108 +1987,6 @@ method, one of the most popular choices for Traditional Chinese users.")
    (license license:lgpl2.1+)))
@end lisp

-@node Packaging Elixir Applications
-@subsection Packaging Elixir Applications
-
-In preparation, add the following packages to your environment:
-
-@example
-$ guix shell elixir elixir-depscheck elixir-mix-audit
-@end example
-
-In this example, we package @uref{https://livebook.dev, livebook},
-which is an interactive, web-based notebook environment for writing,
-running, and sharing Elixir code with rich documentation and
-visualizations.
-
-@enumerate
-@item
-We retrieve the @code{livebook} source code with the latest version
-from the corresponding @code{git} repository:
-
-@example
-$ git clone --branch v0.18.2 --depth 1 \
-      https://github.com/livebook-dev/livebook
-@end example
-
-We should prepare the following definiton for this package (the suggested
-location for this definition should be @code{gnu/packages/beam-packages.scm}
-or up to your mind):
-
-@lisp
-(define-public livebook
-  (package
-    (name "livebook")
-    (version "0.18.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/livebook-dev/livebook")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1pq227nabslr7gh4qvg24wj4320djc0vrh6x6l23g3468x6znxjm"))))
-    (build-system mix-build-system)
-    (arguments
-     (list
-      #:tests? #f ; TODO: make them work a little bit later
-      #:vendorize? #t
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out")))
-                (copy-recursively "_build/prod/rel/livebook/"
-                                  out)))))))
-    (inputs (mix-inputs 'livebook))
-    (synopsis "Web application for writing code notebooks")
-    (description "This package provides @code{Livebook}, a web application
-for writing interactive and collaborative code notebooks.")
-    (home-page "https://livebook.dev/")
-    (license license:asl2.0)))
-@end lisp
-
-The identifier used to invoke @code{mix-inputs}, in this case the scheme
-symbol @code{'livebook}, must be unique, usually matching the variable name
-of the package.
-
-@item
-Navigate to the unpacked directory, then run the following commands:
-
-@example
-$ mix deps.get
-$ mix deps.audit
-$ mix depscheck --verbose
-@end example
-
-@command{mix deps.audit} checks known vulnerabilities and @command{mix
-depscheck --verbose} checks licenses, for all the dependencies.  We must
-have an acceptable output (i.e. message ``No vulnerabilities found.'') of
-@command{mix deps.audit} and ensure all dependencies are licensed with our
-supported licenses (@pxref{Defining Packages,,, guix, GNU Guix Reference Manual}).
-
-@item
-Import dependencies from the lockfile:
-
-@example
-$ guix import --insert=gnu/packages/beam-packages.scm \
-      mix --lockfile=/path/to/mix.lock livebook
-
-# or:
-$ guix import -i gnu/packages/beam-packages.scm \
-      mix -f /path/to/mix.lock livebook
-@end example
-
-After that the package could be build by using the following command:
-
-@example
-$ guix build livebook
-@end example
-
-@end enumerate
-

@c *********************************************************************
@node System Configuration
@@ -151,7 +151,6 @@ Copyright @copyright{} 2025 Noé Lopez@*
 Copyright @copyright{} 2026 David Elsing@*
 Copyright @copyright{} 2026 Nguyễn Gia Phong@*
 Copyright @copyright{} 2026 Yarl Baudig@*
-Copyright @copyright{} 2026 Igorj Gorjaĉev@*

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -15389,31 +15388,6 @@ Additional options include:
 Traverse the dependency graph of the given upstream package recursively
 and generate package expressions for all those packages that are not yet
 in Guix.
-@item --mix-inputs
-@itemx -m
-Use vendored @code{mix-inputs} for @code{input} field instead of common
-dependencies.
-@end table
-
-@item mix
-@cindex mix
-Import metadata from the @file{mix.lock}, Elixir's
-@uref{https://hexdocs.pm/elixir/introduction-to-mix.html, mix} lock file,
-as in this example:
-
-@example
-guix import mix -f mix.lock yourapp
-@end example
-
-Mandatory options are:
-
-@table @code
-@item --lockfile=@var{file}
-@itemx -f @var{file}
-@option{--lockfile} must be a @file{mix.lock} file.
-
-@xref{Packaging Elixir Applications,,, guix-cookbook, GNU Guix Cookbook}, for
-packaging workflow utilizing it.
@end table
@end table

@@ -482,21 +482,15 @@ already exists.  Lookup team IDs among CURRENT-TEAMS."
        #:name "Erlang/Elixir/BEAM team"
        #:description "The virtual machine at the core of the Erlang Open
 Telecom Platform (OTP), Erlang and Elxir languages and packages, development
-of Rebar and Mix build systems, Hex.pm and Mix importers."
-        #:scope (list (make-regexp* "^gnu/packages/beam-.+\\.scm$")
-                      (make-regexp* "^gnu/packages/elixir(-.+|)\\.scm$")
+of Rebar and Mix build systems and Hex.pm importer."
+        #:scope (list (make-regexp* "^gnu/packages/elixir(-.+|)\\.scm$")
                      "guix/build/mix-build-system.scm"
                      "guix/build-system/mix.scm"
                      (make-regexp* "^gnu/packages/erlang(-.+|)\\.scm$")
                      "guix/build/rebar-build-system.scm"
                      "guix/build-system/rebar.scm"
                      "guix/import/hexpm.scm"
-                      "guix/import/mix.scm"
-                      "guix/import/mix/mix-lock.scm"
-                      "guix/scripts/import/hexpm.scm"
-                      "guix/scripts/import/mix.scm"
-                      "tests/import/hexpm.scm"
-                      "tests/import/mix.scm")))
+                      "guix/scripts/import/hexpm.scm")))

 (define-team bioinformatics
  (team 'bioinformatics
@@ -75,7 +75,6 @@
 # Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
 # Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 # Copyright © 2025 bdunahu <bdunahu@operationnull.com>
-# Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
 #
 # This file is part of GNU Guix.
 #
@@ -176,9 +175,6 @@ GNU_SYSTEM_MODULES =				\
  %D%/packages/bash.scm				\
  %D%/packages/batik.scm			\
  %D%/packages/bdw-gc.scm			\
-  %D%/packages/beam-apps.scm			\
-  %D%/packages/beam-packages.scm		\
-  %D%/packages/beam-sources.scm			\
  %D%/packages/benchmark.scm			\
  %D%/packages/bioconductor.scm			\
  %D%/packages/bioinformatics.scm		\
@@ -1232,7 +1228,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/elfutils-tests-ptrace.patch		\
  %D%/packages/patches/elixir-httpoison-tag-network-dependent-test-cases.patch			\
  %D%/packages/patches/elixir-path-length.patch			\
-  %D%/packages/patches/elixir-vendoring-support.patch		\
  %D%/packages/patches/elm-ghc9.2.patch	\
  %D%/packages/patches/exaile-gstreamer-1.28.patch	\
  %D%/packages/patches/python-treelib-remove-python2-compat.patch	\
@@ -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")
@@ -1,25 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages beam-apps)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system mix))
@@ -1,43 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages beam-packages)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system mix)
-  #:use-module (gnu packages beam-sources)
-  #:export (lookup-mix-inputs))
-
-;;;
-;;; This file is managed by ‘guix import’.  Do NOT add definitions manually.
-;;;
-;;; BEAM libraries fetched from hex.pm.
-;;;
-
-(define aaaa-separator 'begin-of-beam-packages)
-
-(define cccc-separator 'end-of-beam-packages)
-
-
-;;;
-;;; Mix inputs.
-;;;
-
-(define-mix-inputs lookup-mix-inputs)
@@ -1,29 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages beam-sources)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system mix))
-
-;;;
-;;; BEAM libraries requiring modification.
-;;; These packages are hidden, as they are not interesting to users.
-;;;
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Pierre-Henry Fröhring <phfrohring@deeplinks.com>
-;;; Copyright © 2024, 2026 Igorj Gorjaĉev <igor@goryachev.org>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
 ;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -24,7 +24,6 @@
  #:use-module (gnu packages linux)
  #:use-module (gnu packages compression)
  #:use-module (gnu packages base)
-  #:use-module (gnu packages erlang)
  #:use-module (gnu packages erlang-xyz)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages)
@@ -424,25 +423,6 @@ implementing function decorators for Elixir.")
    (home-page "https://hexdocs.pm/decorator/")
    (license license:expat)))

-(define-public elixir-depscheck
-  (package
-    (name "elixir-depscheck")
-    (version "1.0.11")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hexpm-uri "depscheck" version))
-       (sha256
-        (base32 "1v33ml2i19s59518j9031bsvipbf4xxr4xk49qx6xs3qby0018aw"))))
-    (build-system mix-build-system)
-    (synopsis "Checking dependency license compatibility in Elixir projects")
-    (description "This package provides @code{elixir-depscheck}, a @code{CI/CD}
-tool for checking dependency license compatibility in Elixir projects.  Reads
-license information from local hex metadata files and validates compatibility
-with your project's license using industry-standard rules.")
-    (home-page "https://hexdocs.pm/depscheck/")
-    (license license:expat)))
-
 (define-public elixir-erlex
  (package
    (name "elixir-erlex")
@@ -751,28 +731,6 @@ Elixir.")
    (home-page "https://hexdocs.pm/mimic/")
    (license license:asl2.0)))

-(define-public elixir-mix-audit
-  (package
-    (name "elixir-mix-audit")
-    (version "2.1.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hexpm-uri "mix_audit" version))
-       (sha256
-        (base32 "0s9dnk42n5665s6l22qf05x63ly11n37am2kmybzccns4672kyc7"))))
-    (build-system mix-build-system)
-    (propagated-inputs
-     (list elixir-jason
-           elixir-yaml-elixir))
-    (synopsis "Scanning Mix dependencies for security vulnerabilities")
-    (description "This package provides @code{elixir-mix-audit}, a
-@code{mix deps.audit} task to scan @code{Mix} dependencies for security
-vulnerabilities.  It draw its inspiration from tools like npm audit and
-bundler-audit.")
-    (home-page "https://hexdocs.pm/mix_audit/")
-    (license license:bsd-3)))
-
 (define-public elixir-mox
  (package
    (name "elixir-mox")
@@ -1269,34 +1227,6 @@ provides a polyfill for @code{dbg} which was introduced in Elixir 1.14.")
    (home-page "https://hexdocs.pm/verbs/")
    (license license:expat)))

-(define-public elixir-yaml-elixir
-  (package
-    (name "elixir-yaml-elixir")
-    (version "2.12.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hexpm-uri "yaml_elixir" version))
-       (sha256
-        (base32 "1ihknd9qy8y533zd150ch2yag2h895hsp86wamqpm4dcgfpaqsya"))))
-    (build-system mix-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-yamerl-hrl-path
-            (lambda _
-              (substitute* "lib/yaml_elixir/records.ex"
-                (("internal\\/yamerl_constr\\.hrl")
-                 "yamerl_constr.hrl")))))))
-    (propagated-inputs
-     (list erlang-yamerl))
-    (synopsis "YAML parser for Elixir based on native Erlang implementation")
-    (description "This package provides @code{elixir-yaml-elixir}, a @code{YAML}
-parser for @code{Elixir} based on native @code{Erlang} implementation.")
-    (home-page "https://hexdocs.pm/yaml_elixir/")
-    (license license:expat)))
-
 (define-public elixir-zest
  (package
    (name "elixir-zest")
@@ -51,8 +51,7 @@
       (file-name (git-file-name name version))
       (sha256
        (base32 "1i10a5d7mlcrav47k7qirqvrqn2kbl5265fbcp8fzavr86xz67m6"))
-       (patches (search-patches "elixir-path-length.patch"
-                                "elixir-vendoring-support.patch"))))
+       (patches (search-patches "elixir-path-length.patch"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -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
@@ -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
@@ -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")
@@ -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
@@ -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")
@@ -1,56 +0,0 @@
-Author: Igorj Gorjaĉev <igor@goryachev.org>
-Date:   Wed Oct 22 10:10:13 2025 +0300
-
-    vendoring support for guix
-
-diff --git a/lib/mix/lib/mix/dep/loader.ex b/lib/mix/lib/mix/dep/loader.ex
-index e47bfc556..0ddd49fe5 100644
--- a/lib/mix/lib/mix/dep/loader.ex
-+++ b/lib/mix/lib/mix/dep/loader.ex
-@@ -198,6 +198,10 @@ defp with_scm_and_app(app, req, opts, original, locked?) do
-       )
-     end
- 
-+    scm = Mix.Guix.scm(scm)
-+    req = Mix.Guix.req(req)
-+    opts = Mix.Guix.opts(opts, app)
-+
-     %Mix.Dep{
-       scm: scm,
-       app: app,
-diff --git a/lib/mix/lib/mix/guix.ex b/lib/mix/lib/mix/guix.ex
-new file mode 100644
-index 000000000..9c821704c
--- /dev/null
-+++ b/lib/mix/lib/mix/guix.ex
-@@ -0,0 +1,30 @@
-+defmodule Mix.Guix do
-+  @moduledoc false
-+
-+  @guix_vendorize "GUIX_MIX_VENDOR_DIR"
-+
-+  def scm(scm), do: (vendorize?() && Mix.SCM.Path) || scm
-+
-+  def req(req), do: (vendorize?() && nil) || req
-+
-+  def opts(opts, app) do
-+    if vendorize?() do
-+      if Keyword.has_key?(opts, :path) do
-+        opts
-+      else
-+        dep_dir = vendor_dep_dir(app)
-+
-+        [path: dep_dir, dest: dep_dir] ++
-+          Keyword.drop(opts, [:hex, :override, :repo, :lock, :dest])
-+      end
-+    else
-+      opts
-+    end
-+  end
-+
-+  defp vendorize?, do: not is_nil(vendor_dir())
-+
-+  defp vendor_dir, do: System.get_env(@guix_vendorize)
-+
-+  defp vendor_dep_dir(name), do: "#{vendor_dir()}/#{name}"
-+end
@@ -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
@@ -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
@@ -1,7 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com>
 ;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
-;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,10 +28,7 @@
  #:use-module (guix build mix-build-system)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system)
-  #:use-module (guix diagnostics)
-  #:use-module (guix download)
  #:use-module (guix gexp)
-  #:use-module (guix i18n)
  #:use-module (guix monads)
  #:use-module (guix packages)
  #:use-module (guix search-paths)
@@ -41,12 +37,7 @@
  #:use-module (ice-9 match)
  #:use-module (srfi srfi-1)
  #:use-module (srfi srfi-26)
-  #:export (mix-build-system
-            hexpm-uri
-            beam-name->package-name
-            hexpm-source
-            define-mix-inputs
-            mix-inputs))
+  #:export (mix-build-system hexpm-uri))

 (define (default-elixir-hex)
  (@* (gnu packages elixir) elixir-hex))
@@ -73,48 +64,6 @@ See: https://github.com/hexpm/specifications/blob/main/endpoints.md"
    strip-prefix)
   name))

-(define (beam-name->package-name name)
-  (downstream-package-name "beam-" name))
-
-;; NOTE: Only use this procedure in (gnu packages beam-packages).
-(define* (hexpm-source package-name hexpm-name hexpm-version hexpm-hash
-                       #:key (patches '()) (snippet #f))
-  (origin
-    (method url-fetch)
-    (uri (hexpm-uri hexpm-name hexpm-version))
-    (file-name
-     (string-append "beam-" package-name "-" hexpm-version ".tar"))
-    (sha256 (base32 hexpm-hash))
-    (modules '((guix build utils)))
-    (patches patches)
-    (snippet snippet)))
-
-(define-syntax define-mix-inputs
-  (syntax-rules (=>)
-    ((_ lookup inputs ...)
-     (define lookup
-       (let ((table (make-hash-table)))
-         (letrec-syntax ((record
-                          (syntax-rules (=>)
-                            ((_) #t)
-                            ((_ (name => lst) rest (... ...))
-                             (begin
-                               (hashq-set! table 'name (filter identity lst))
-                               (record rest (... ...)))))))
-           (record inputs ...)
-           (lambda (name)
-             "Return the inputs for NAME."
-             (hashq-ref table name))))))))
-
-(define* (mix-inputs name #:key (module '(gnu packages beam-packages)))
-  "Lookup Mix inputs for NAME defined in MODULE, return an empty list if
-unavailable."
-  (let ((lookup (module-ref (resolve-interface module) 'lookup-mix-inputs)))
-    (or (lookup name)
-        (begin
-          (warning (G_ "no Mix inputs available for '~a'~%") name)
-          '()))))
-
 ;; A number of environment variables specific to the Mix build system are
 ;; reflected here.  They are documented at
 ;; https://hexdocs.pm/mix/Mix.html#module-environment-variables.  Other
@@ -126,9 +75,6 @@ unavailable."
                    source
                    (tests? #t)
                    (test-flags ''())
-                    (vendorize? #f)
-                    (vendor-symlinks? #t)
-                    (vendor-dir "guix-vendor")
                    (mix-path #f) ;See MIX_PATH.
                    (mix-exs "mix.exs") ;See MIX_EXS.
                    (build-per-environment #t) ;See :build_per_environment.
@@ -164,9 +110,6 @@ unavailable."
                           #:system #$system
                           #:tests? #$tests?
                           #:test-flags #$test-flags
-                           #:vendorize? #$vendorize?
-                           #:vendor-symlinks? #$vendor-symlinks?
-                           #:vendor-dir #$vendor-dir
                           #:mix-path #$mix-path
                           #:mix-exs #$mix-exs
                           #:mix-environments '#$mix-environments
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com>
-;;; Copyright © 2024-2026 Igorj Gorjaĉev <igor@goryachev.org>
+;;; Copyright © 2024, 2026 Igorj Gorjaĉev <igor@goryachev.org>
 ;;; Copyright © 2024, 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -48,13 +48,7 @@
 VERSION are installed."
  (string-append path "/lib/elixir/" version))

-(define %elixir-prefix "elixir-")
-
-(define %beam-prefix "beam-")
-
-(define %vendorize-env-var "GUIX_MIX_VENDOR_DIR")
-
-(define* (strip-prefix name #:optional (prefix %elixir-prefix))
+(define* (strip-prefix name #:optional (prefix "elixir-"))
  "Return NAME without the prefix PREFIX."
  (if (string-prefix? prefix name)
      (string-drop name (string-length prefix))
@@ -89,73 +83,9 @@ working directory."
 (define (list-directories dir)
  "List absolute paths of directories directly under the directory DIR."
  (map (cute string-append dir "/" <>)
-       (scandir
-        dir (lambda (filename)
-              (and (not (member filename '("." "..")))
-                   (directory-exists? (string-append dir "/" filename)))))))
-
-(define* (unpack-vendorize #:key vendorize? vendor-dir inputs
-                           #:allow-other-keys)
-  "Unpack vendored packages."
-  (define (inputs->beam-inputs inputs)
-    "Filter using the label part from INPUTS."
-    (filter-map (lambda (input)
-                  (match input
-                    ((name . file)
-                     (and (beam-package? name) file))))
-                inputs))
-  (define (beam-input->upstream-name beam-input)
-    "Convert BEAM-INPUT into upstream package name."
-    ((compose
-      (cute package-name->elixir-name <> %beam-prefix)
-      (cute substring <> 33)
-      basename)
-     beam-input))
-  (define (copy-or-unpack-beam-package beam-input dep-dir)
-    "Copy contents, if BEAM-INPUT is a checkout package, otherwise unpack it."
-    (or (directory-exists? dep-dir)
-        (if (file-is-directory? beam-input)
-            (copy-recursively beam-input dep-dir)
-            (begin
-              (mkdir-p dep-dir)
-              (invoke "sh" "-c"
-                      (string-append "tar -xOf " beam-input
-                                     " contents.tar.gz"
-                                     " | tar -xz -C " dep-dir))))))
-  (and
-   vendorize?
-   (begin
-     (mkdir-p vendor-dir)
-     (setenv %vendorize-env-var (canonicalize-path vendor-dir))
-     (let ((beam-inputs (delete-duplicates (inputs->beam-inputs inputs))))
-       (unless (null? beam-inputs)
-         (for-each
-          (lambda (beam-input)
-            (let* ((upstream-name (beam-input->upstream-name beam-input))
-                   (dep-dir (string-append vendor-dir "/" upstream-name)))
-              (copy-or-unpack-beam-package beam-input dep-dir)))
-          beam-inputs))))))
-
-(define* (symlink-vendorize #:key vendorize? vendor-symlinks?
-                            #:allow-other-keys)
-  (and
-   vendorize?
-   vendor-symlinks?
-   (let* ((vendor-dir (getenv %vendorize-env-var))
-          (deps-dir (list-directories vendor-dir)))
-     (for-each
-      (lambda (dep-dir)
-        (let ((snapshot (string-contains dep-dir "_snapshot")))
-          (and
-           snapshot
-           (let ((canonical
-                  (string-drop-right
-                   dep-dir (- (string-length dep-dir) snapshot))))
-             (symlink dep-dir canonical)))))
-      deps-dir))))
-
-(define (beam-package? name)
-  (string-prefix? %beam-prefix name))
+       (scandir dir (lambda (filename)
+                      (and (not (member filename '("." "..")))
+                           (directory-exists? (string-append dir "/" filename)))))))

 (define* (set-mix-env #:key inputs mix-path mix-exs #:allow-other-keys)
  "Set environment variables.
@@ -183,32 +113,22 @@ See: https://hexdocs.pm/mix/1.15.7/Mix.html#module-environment-variables"
  (%elixir-version (elixir-version inputs))
  (format #t "Elixir version: ~a~%" (%elixir-version)))

-
-(define* (build #:key mix-environments vendorize?
-                #:allow-other-keys)
+(define* (build #:key mix-environments #:allow-other-keys)
  "Builds the Mix project."
  (for-each (lambda (mix-env)
              (setenv "MIX_ENV" mix-env)
-              (if vendorize?
-                  (invoke "mix" "release")
-                  (invoke "mix" "compile" "--no-prune-code-paths"
-                          "--no-deps-check")))
+              (invoke "mix" "compile" "--no-deps-check"
+                      "--no-prune-code-paths"))
            mix-environments))

-(define* (check #:key (tests? #t) (test-flags '())
-                vendorize?
-                #:allow-other-keys)
+(define* (check #:key (tests? #t) (test-flags '()) #:allow-other-keys)
  "Test the Mix project."
  (if tests?
-      (let ((maybe-no-deps-check-flag
-             (if vendorize? '() '("--no-deps-check"))))
+      (begin
        (setenv "MIX_ENV" "test")
-        (apply invoke
-               (append '("mix" "do" "compile")
-                       maybe-no-deps-check-flag
-                       '("--no-prune-code-paths" "+" "test")
-                       maybe-no-deps-check-flag
-                       test-flags)))
+        (apply invoke "mix" "do" "compile" "--no-deps-check"
+                       "--no-prune-code-paths" "+" "test"
+                       "--no-deps-check" test-flags))
      (format #t "tests? = ~a~%" tests?)))

 (define* (remove-mix-dirs . _)
@@ -217,7 +137,7 @@ We do not want to copy them to the installation directory."
  (for-each delete-file-recursively
            (find-files "." (file-name-predicate "\\.mix$") #:directories? #t)))

-(define* (package-name->elixir-name name+ver #:optional (prefix %elixir-prefix))
+(define (package-name->elixir-name name+ver)
  "Convert the Guix package NAME-VER to the corresponding Elixir name-version
 format.  Example: elixir-a-pkg-1.2.3 -> a_pkg or elixir-a-pkg-0.0.0-0.e51e36e
 -> a_pkg"
@@ -226,7 +146,7 @@ format.  Example: elixir-a-pkg-1.2.3 -> a_pkg or elixir-a-pkg-0.0.0-0.e51e36e
    (cute string-join <> "_")
    (cute drop-right <> (if git-version? 2 1))
    (cute string-split <> #\-))
-   (strip-prefix name+ver prefix)))
+   (strip-prefix name+ver)))

 (define* (install #:key
                  inputs
@@ -235,24 +155,13 @@ format.  Example: elixir-a-pkg-1.2.3 -> a_pkg or elixir-a-pkg-0.0.0-0.e51e36e
                  build-per-environment
                  #:allow-other-keys)
  "Install build artifacts in the store."
-  (if (beam-package? name)
-      (let* ((out (assoc-ref outputs "out"))
-             (excluded '("CHECKSUM" "contents.tar.gz" "environment-variables"
-                         "metadata.config" "VERSION"))
-             (files
-              (filter
-               (lambda (f)
-                 (not (member f (cons* "." ".." excluded))))
-               (scandir "."))))
-        (mkdir-p out)
-        (apply invoke "cp" "-r" (append files (list out))))
-      (let* ((lib-name (package-name->elixir-name name))
-             (lib-dir (string-append (elixir-libdir (assoc-ref outputs "out")) "/" lib-name))
-             (root (getenv "MIX_BUILD_ROOT"))
-             (env (if build-per-environment "prod" "shared")))
-        (mkdir-p lib-dir)
-        (copy-recursively (string-append (mix-build-dir root env) "/" lib-name) lib-dir
-                          #:follow-symlinks? #t))))
+  (let* ((lib-name (package-name->elixir-name name))
+         (lib-dir (string-append (elixir-libdir (assoc-ref outputs "out")) "/" lib-name))
+         (root (getenv "MIX_BUILD_ROOT"))
+         (env (if build-per-environment "prod" "shared")))
+    (mkdir-p lib-dir)
+    (copy-recursively (string-append (mix-build-dir root env) "/" lib-name) lib-dir
+                      #:follow-symlinks? #t)))

 (define %standard-phases
  (modify-phases gnu:%standard-phases
@@ -261,8 +170,6 @@ format.  Example: elixir-a-pkg-1.2.3 -> a_pkg or elixir-a-pkg-0.0.0-0.e51e36e
    (add-after 'install-locale 'set-mix-env set-mix-env)
    (add-after 'set-mix-env 'set-elixir-version set-elixir-version)
    (replace 'unpack unpack)
-    (add-after 'unpack 'unpack-vendorize unpack-vendorize)
-    (add-after 'unpack-vendorize 'symlink-vendorize symlink-vendorize)
    (replace 'build build)
    (replace 'check check)
    (add-before 'install 'remove-mix-dirs remove-mix-dirs)
@@ -177,37 +177,33 @@ as symbols."
 (define* (make-hexpm-sexp #:key name version tarball-url
                          home-page synopsis description license
                          language build-system dependencies
-                          mix-inputs?
                          #:allow-other-keys)
  "Return the `package' s-expression for a hexpm package with the given NAME,
 VERSION, TARBALL-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE. The
 created package's name will stem from LANGUAGE. BUILD-SYSTEM defined the
-build-system, and DEPENDENCIES or MIX-INPUTS? the inputs for the package."
-  (let ((package-name (hexpm-name->package-name name language)))
-    (call-with-temporary-output-file
-     (lambda (temp port)
-       (and (url-fetch tarball-url temp)
-            (values
-             `(package
-                (name ,package-name)
-                (version ,version)
-                (source (origin
-                          (method url-fetch)
-                          (uri (hexpm-uri ,name version))
-                          (sha256 (base32 ,(guix-hash-url temp)))))
-                (build-system ,build-system)
-                ,@(if mix-inputs?
-                      `((inputs (mix-inputs ',(string->symbol package-name))))
-                      (maybe-inputs (dependencies->package-names dependencies) 'inputs))
-                (synopsis ,synopsis)
-                (description ,(beautify-description description))
-                (home-page ,(match home-page
-                              (() "")
-                              (_ home-page)))
-                (license ,(match license
-                            (() #f)
-                            ((license) license)
-                            (_ `(list ,@license)))))))))))
+build-system, and DEPENDENCIES the inputs for the package."
+  (call-with-temporary-output-file
+   (lambda (temp port)
+     (and (url-fetch tarball-url temp)
+          (values
+       `(package
+         (name ,(hexpm-name->package-name name language))
+         (version ,version)
+         (source (origin
+                   (method url-fetch)
+                   (uri (hexpm-uri ,name version))
+                   (sha256 (base32 ,(guix-hash-url temp)))))
+         (build-system ,build-system)
+         ,@(maybe-inputs (dependencies->package-names dependencies) 'inputs)
+         (synopsis ,synopsis)
+         (description ,(beautify-description description))
+         (home-page ,(match home-page
+                            (() "")
+                            (_ home-page)))
+         (license ,(match license
+                          (() #f)
+                          ((license) license)
+                          (_ `(list ,@license))))))))))

 (define (strings->licenses strings)
  "Convert the list of STRINGS into a list of license objects."
@@ -225,13 +221,11 @@ object, ordered from newest to oldest."
  (sort (map hexpm-version-number (hexpm-versions package))
        version>?))

-(define* (hexpm->guix-package package-name #:key version
-                              mix-inputs? #:allow-other-keys)
-  "Fetch the metadata for PACKAGE-NAME from hex.pm, and return the
+(define* (hexpm->guix-package package-name #:key version #:allow-other-keys)
+  "Fetch the metadata for PACKAGE-NAME from hexpms.io, and return the
 `package' s-expression corresponding to that package, or #f on failure.
 When VERSION is specified, attempt to fetch that version; otherwise fetch the
-latest version of PACKAGE-NAME.  It can use `inputs` with `mix-inputs` when
-MIX-INPUTS? is specified."
+latest version of PACKAGE-NAME."

  (define package
    (lookup-hexpm package-name))
@@ -283,7 +277,6 @@ MIX-INPUTS? is specified."
           #:name package-name
           #:version version-number
           #:dependencies dependencies
-           #:mix-inputs? mix-inputs?
           #:home-page (or (and (not (eq? docs-html-url 'null))
                                docs-html-url)
                           ;; TODO: Homepage?
@@ -1,143 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (guix import mix)
-  #:use-module (guix import mix mix-lock)
-  #:use-module (guix base16)
-  #:use-module (guix base32)
-  #:use-module (guix read-print)
-  #:use-module (guix scripts download)
-  #:autoload   (guix utils) (find-definition-location)
-  #:use-module (ice-9 match)
-  #:use-module (ice-9 textual-ports)
-  #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-26)
-  #:use-module (srfi srfi-71)
-  #:use-module (guix build-system mix)
-  #:export (mix-lock->expressions
-            mix-inputs-from-lockfile
-            find-mix-inputs-location
-            extract-mix-inputs))
-
-
-;;;
-;;; Convert ‘mix.lock’ to Guix sources.
-;;;
-
-(define (mix-lock->expressions lockfile package-name)
-  "Given LOCKFILE, a 'mix.lock' file, import its content as source
-expressions.  Return a source list and a mix inputs entry for PACKAGE-NAME
-referencing all imported sources."
-  (define (mix-lock-entry->guix-source mix-lock-entry)
-    (match mix-lock-entry
-      (('mix-lock-entry
-        ('entry-name entry-name)
-        ('entry-hexpm
-         ('hexpm-name hexpm-name)
-         ('hexpm-version hexpm-version)
-         _
-         ('hexpm-checksum hexpm-checksum)))
-       `(define
-          ,(string->symbol
-            (string-append
-             (beam-name->package-name entry-name) "-" hexpm-version))
-          (hexpm-source ,entry-name ,hexpm-name ,hexpm-version
-                        ,(bytevector->nix-base32-string
-                          (base16-string->bytevector hexpm-checksum)))))
-      ;; Git snapshot.
-      (('mix-lock-entry
-        ('entry-name entry-name)
-        ('entry-git
-         ('git-url git-url)
-         ('git-commit git-commit)))
-       (begin
-         (let* ((version (string-append "snapshot." (string-take git-commit 7)))
-                (checksum
-                 (second
-                  (string-split
-                   (with-output-to-string
-                     (lambda _
-                       (guix-download "-g" git-url
-                                      (string-append "--commit=" git-commit))))
-                   #\newline))))
-           `(define
-              ,(string->symbol
-                (string-append
-                 (beam-name->package-name entry-name) "-" version))
-              (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url ,git-url)
-                       (commit ,git-commit)))
-                (file-name
-                 (git-file-name
-                  ,(beam-name->package-name entry-name) ,version))
-                (sha256 (base32 ,checksum)))))))
-      (else #f)))
-
-  (let* ((source-expressions
-          (filter-map mix-lock-entry->guix-source
-                      (mix-lock-string->scm
-                       (call-with-input-file lockfile get-string-all))))
-         (beam-inputs-entry
-          `(,(string->symbol package-name) =>
-            (list ,@(map second source-expressions)))))
-    (values source-expressions beam-inputs-entry)))
-
-(define* (mix-inputs-from-lockfile #:optional (lockfile "mix.lock"))
-  "Given LOCKFILE (default to \"mix.lock\" in current directory), return a
-source list imported from it, to be used as package inputs.  This procedure
-can be used for adding a manifest file within the source tree of a BEAM
-application."
-  (let ((source-expressions
-         mix-inputs-entry
-         (mix-lock->expressions lockfile "mix-inputs-temporary")))
-    (eval-string
-     (call-with-output-string
-       (lambda (port)
-         (for-each
-          (cut pretty-print-with-comments port <>)
-          `((use-modules (guix build-system mix))
-            ,@source-expressions
-            (define-mix-inputs lookup-mix-inputs ,mix-inputs-entry)
-            (lookup-mix-inputs 'mix-inputs-temporary))))))))
-
-(define (find-mix-inputs-location file)
-  "Search in FILE for a top-level definition of mix inputs.  Return the
-location if found, or #f otherwise."
-  (find-definition-location file 'lookup-mix-inputs
-                            #:define-prefix 'define-mix-inputs))
-
-(define* (extract-mix-inputs file #:key exclude)
-  "Search in FILE for a top-level definition of mix inputs.  If found,
-return its entries excluding EXCLUDE, or an empty list otherwise."
-  (call-with-input-file file
-    (lambda (port)
-      (do ((syntax (read-syntax port)
-                   (read-syntax port)))
-          ((match (syntax->datum syntax)
-             (('define-mix-inputs 'lookup-mix-inputs _ ...) #t)
-             ((? eof-object?) #t)
-             (_ #f))
-           (or (and (not (eof-object? syntax))
-                    (match (syntax->datum syntax)
-                      (('define-mix-inputs 'lookup-mix-inputs inputs ...)
-                       (remove (lambda (mix-input-entry)
-                                 (eq? exclude (first mix-input-entry)))
-                               inputs))))
-               '()))))))
@@ -1,201 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (guix import mix mix-lock)
-  #:use-module (ice-9 peg)
-  #:export (mix-lock-string->scm
-
-            entry-git
-            entry-hexpm
-            entry-name
-            git-commit
-            git-url
-            hexpm-build-system
-            hexpm-build-systems
-            hexpm-name
-            hexpm-version
-            mix-lock
-            mix-lock-entry))
-
-;;;
-;;; PEG parser for ‘mix.lock’.
-;;;
-
-(define (mix-lock-string->scm str)
-  (peg:tree (search-for-pattern mix-lock str)))
-
-;; Auxiliar peg patterns
-(define-peg-pattern numeric-char body
-  (range #\0 #\9))
-
-(define-peg-pattern lowercase-char body
-  (range #\a #\z))
-
-(define-peg-pattern uppercase-char body
-  (range #\A #\Z))
-
-(define-peg-pattern alphabetic-char body
-  (or lowercase-char uppercase-char))
-
-(define-peg-pattern alphanumeric-char body
-  (or alphabetic-char numeric-char))
-
-(define-peg-pattern space-char body
-  (+ (or " " "\t" "\n" "\r")))
-
-(define-peg-pattern opt-space-char body
-  (* space-char))
-
-;; string: "string"
-(define-peg-pattern string-char body
-  (or alphanumeric-char
-      space-char
-      "_" "." "~" "=" "<" ">" "/" ":" "-"))
-
-(define-peg-pattern string body
-  (and (ignore "\"")
-       (* string-char)
-       (ignore "\"")))
-
-;; atom: :hex or true | false | nil
-(define-peg-pattern atom-char body
-  (or alphanumeric-char "_" "@" "?" "!"))
-
-(define-peg-pattern atom body
-  (or
-   (and (ignore ":")
-        (+ atom-char))
-   "true" "false" "nil"))
-
-;; list: [ ... ]
-(define-peg-pattern list body
-  (and (ignore "[")
-       (* (and
-           (ignore (? ", "))
-           (or value key-value)))
-       (ignore "]")))
-
-;; tuple: { ... }
-(define-peg-pattern tuple body
-  (and (ignore "{")
-       (* (and
-           (ignore (? ", "))
-           value))
-       (ignore "}")
-       (ignore (? "\n"))))
-
-;; syntactic sugar for [{key, value} ...]
-(define-peg-pattern key-value body
-  (ignore
-   (and (+ atom-char) ": " value)))
-
-;; value may be string, atom, tuple, list
-(define-peg-pattern value body
-  (and (ignore opt-space-char)
-       (or string atom tuple list)
-       (ignore opt-space-char)))
-
-;; ignore several constructions
-(define-peg-pattern ignore-string body
-  (ignore
-   (and "\""
-        (* (or string-char
-               space-char))
-        "\"")))
-
-(define-peg-pattern ignore-comma-space body
-  (ignore ", "))
-
-(define-peg-pattern ignore-list body
-  (ignore (and "["
-               (* (and
-                   (? ", ")
-                   (or value key-value)))
-               "]")))
-
-;; exported symbols
-(define-peg-pattern entry-name all
-  string)
-
-(define-peg-pattern hexpm-name all
-  atom)
-
-(define-peg-pattern hexpm-version all
-  string)
-
-(define-peg-pattern hexpm-checksum all
-  string)
-
-(define-peg-pattern hexpm-build-system all
-  (capture (+ (or alphanumeric-char "_" "-"))))
-
-(define-peg-pattern hexpm-build-systems all
-  (and (ignore "[")
-       (capture
-        (* (and (ignore ":")
-                (capture hexpm-build-system)
-                (ignore (? ", ")))))
-       (ignore "]")))
-
-(define-peg-pattern git-url all
-  string)
-
-(define-peg-pattern git-commit all
-  string)
-
-(define-peg-pattern entry-hexpm all
-  (and
-   (ignore ": {:hex, ")
-   hexpm-name
-   ignore-comma-space
-   (capture hexpm-version)
-   ignore-comma-space
-   ignore-string
-   ignore-comma-space
-   (capture hexpm-build-systems)
-   ignore-comma-space
-   ignore-list
-   ignore-comma-space
-   ignore-string
-   ignore-comma-space
-   (capture hexpm-checksum)
-   (ignore "}")))
-
-(define-peg-pattern entry-git all
-  (and
-   (ignore ": {:git, ")
-   git-url
-   ignore-comma-space
-   git-commit
-   ignore-comma-space
-   ignore-list
-   (ignore "}")))
-
-(define-peg-pattern mix-lock-entry all
-  (and (ignore (? "  "))
-       (capture entry-name)
-       (or
-        entry-hexpm
-        entry-git)
-       (ignore (? ",\n"))))
-
-;; mix.lock
-(define-peg-pattern mix-lock all
-  (and (ignore "%{\n")
-       (* mix-lock-entry)
-       (ignore "}")))
@@ -7,7 +7,6 @@
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
 ;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
-;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,7 +63,6 @@
 (define importers '("composer" "cpan" "cran" "crate" "egg" "elm" "elpa"
                    "gem" "gnu" "go" "hackage" "hexpm" "json" "luanti"
                    "minetest"          ; deprecated
-                    "mix"
                    "npm-binary" "nuget" "opam" "pypi" "stackage" "texlive"))

 (define (resolve-importer name)
@@ -145,10 +143,10 @@ PROC callback."
    ((or ("-i" file importer args ...)
         ("--insert" file importer args ...))
     (let* ((define-prefixes
-              `(,@(if (member importer '("crate" "mix"))
-                      '(define)
-                      '())
-                define-public))
+             `(,@(if (member importer '("crate"))
+                     '(define)
+                     '())
+               define-public))
            (define-prefix? (cut member <> define-prefixes))
            (find-and-insert
             (lambda (expr)
@@ -174,9 +172,9 @@ PROC callback."
    ((importer args ...)
     (let ((print (lambda (expr)
                    (leave-on-EPIPE
-                     (pretty-print-with-comments
-                      (current-output-port) expr)
-                     ;; Two newlines: one after the closing paren, and
-                     ;; one to leave a blank line.
-                     (newline) (newline)))))
+                      (pretty-print-with-comments
+                        (current-output-port) expr)
+                      ;; Two newlines: one after the closing paren, and
+                      ;; one to leave a blank line.
+                      (newline) (newline)))))
       (import-as-definitions importer args print)))))
@@ -47,8 +47,6 @@ Import and convert the hex.pm package for PACKAGE-NAME.\n"))
  (newline)
  (display (G_ "
  -r, --recursive        import packages recursively"))
-  (display (G_ "
-  -m, --mix-inputs       use mix-inputs for input field"))
  (newline)
  (show-bug-report-information))

@@ -64,9 +62,6 @@ Import and convert the hex.pm package for PACKAGE-NAME.\n"))
         (option '(#\r "recursive") #f #f
                 (lambda (opt name arg result)
                   (alist-cons 'recursive #t result)))
-         (option '("mix-inputs") #f #f
-                 (lambda (opt name arg result)
-                   (alist-cons 'mix-inputs #t result)))
         %standard-import-options))


@@ -99,9 +94,7 @@ Import and convert the hex.pm package for PACKAGE-NAME.\n"))
                     (_ #f))
                    (hexpm-recursive-import name version))
               ;; Single import
-               (let* ((mix-inputs (assoc-ref opts 'mix-inputs))
-                      (sexp (hexpm->guix-package name #:version version
-                                                 #:mix-inputs? mix-inputs)))
+               (let ((sexp (hexpm->guix-package name #:version version)))
                 (unless sexp
                   (leave (G_ "failed to download meta-data for package '~a'~%")
                          spec))
@@ -1,122 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (guix scripts import mix)
-  #:use-module (guix ui)
-  #:use-module (guix utils)
-  #:use-module (guix read-print)
-  #:use-module (guix scripts)
-  #:use-module (guix import mix)
-  #:use-module (guix scripts import)
-  #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-37)
-  #:use-module (srfi srfi-71)
-  #:use-module (ice-9 match)
-  #:export (guix-import-mix))
-
-
-;;;
-;;; Command-line options.
-;;;
-
-(define %default-options
-  '())
-
-(define (show-help)
-  (display (G_ "Usage: guix import mix PACKAGE-NAME
-Import package dependencies from its 'mix.lock'.\n"))
-  (display (G_ "
-  -h, --help             display this help and exit"))
-  (display (G_ "
-  -V, --version          display version information and exit"))
-  (newline)
-  (display (G_ "
-  -f, --lockfile=FILE    import dependencies from FILE, a 'mix.lock' file"))
-  (newline)
-  (show-bug-report-information))
-
-(define %options
-  ;; Specification of the command-line options.
-  (cons* (option '(#\h "help") #f #f
-                 (lambda args
-                   (show-help)
-                   (exit 0)))
-         (option '(#\V "version") #f #f
-                 (lambda args
-                   (show-version-and-exit "guix import mix")))
-         (option '(#\f "lockfile") #f #t
-                 (lambda (opt name arg result)
-                   (if (file-exists? arg)
-                       (alist-cons 'lockfile arg result)
-                       (leave (G_ "file '~a' does not exist~%") arg))))
-         %standard-import-options))
-
-
-;;;
-;;; Entry point.
-;;;
-
-(define (guix-import-mix . args)
-  (define (parse-options)
-    ;; Return the alist of option values.
-    (parse-command-line args %options (list %default-options)
-                        #:build-options? #f))
-
-  (let* ((opts (parse-options))
-         (lockfile (assoc-ref opts 'lockfile))
-         (file-to-insert (assoc-ref opts 'file-to-insert))
-         (args (filter-map (match-lambda
-                             (('argument . value)
-                              value)
-                             (_ #f))
-                           (reverse opts))))
-    (match args
-      ((spec)
-       (define-values (name version)
-         (package-name->name+version spec))
-
-       (if lockfile
-           (let ((source-expressions
-                  _
-                  (mix-lock->expressions lockfile name)))
-             (when file-to-insert
-               (let* ((source-expressions
-                       mix-inputs-entry
-                       (mix-lock->expressions lockfile name))
-                      (term (first mix-inputs-entry))
-                      (mix-inputs
-                       `(define-mix-inputs lookup-mix-inputs
-                          ,@(sort
-                             (cons mix-inputs-entry
-                                   (extract-mix-inputs
-                                    file-to-insert #:exclude term))
-                             (lambda (a b)
-                               (string< (symbol->string (first a))
-                                        (symbol->string (first b)))))))
-                      (_
-                       (and=> (find-mix-inputs-location file-to-insert)
-                              delete-expression))
-                      (port (open-file file-to-insert "a")))
-                 (pretty-print-with-comments port mix-inputs)
-                 (newline port)
-                 (close-port port)))
-             source-expressions)))
-      (()
-       (leave (G_ "too few arguments~%")))
-      ((many ...)
-       (leave (G_ "too many arguments~%"))))))
@@ -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
@@ -250,48 +250,4 @@
          (x
           (pk 'fail x #f))))))

-(test-assert "hexpm-with-mix-inputs"
-  ;; Replace network resources with sample data.
-  (mock ((guix http-client) http-fetch
-         (lambda (url . rest)
-           (match url
-             ("https://hex.pm/api/packages/bla"
-              (values (open-input-string test-bla-package)
-                      (string-length test-bla-package)))
-             ("https://hex.pm/api/packages/bla/releases/1.5.0"
-              (values (open-input-string test-bla-release)
-                      (string-length test-bla-release)))
-             (_ (error "http-fetch got unexpected URL: " url)))))
-  (mock ((guix build download) url-fetch
-         (lambda* (url file-name
-                       #:key
-                       (mirrors '()) verify-certificate?)
-           (with-output-to-file file-name
-             (lambda ()
-               (display
-                (match url
-                  ("https://repo.hex.pm/tarballs/bla-1.5.0.tar"
-                   "source")
-                  (_ (error "url-fetch got unexpected URL: " url))))))))
-    (match (hexpm->guix-package "bla" #:mix-inputs? #t)
-      (`(package
-          (name "erlang-bla")
-          (version "1.5.0")
-          (source
-           (origin
-             (method url-fetch)
-             (uri (hexpm-uri "bla" version))
-             (sha256
-              (base32
-               "0zcl4dgcmqwl1g5xb901pd6dz61r1xgmac9mqlwvh022paa6gks1"))))
-          (build-system rebar-build-system)
-          (inputs (mix-inputs 'erlang-bla))
-          (synopsis "A cool package")
-          (description "This package provides a cool package.")
-          (home-page "https://hex.pm/packages/bla")
-          (license (list license:expat license:asl2.0)))
-       #t)
-      (x
-       (pk 'fail x #f))))))
-
 (test-end "hexpm")
@@ -1,97 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (test-mix)
-  #:use-module (guix import mix)
-  #:use-module (guix base32)
-  #:use-module (guix build-system mix)
-  #:use-module (gcrypt hash)
-  #:use-module (guix tests)
-  #:use-module (srfi srfi-11)
-  #:use-module (srfi srfi-64)
-  #:use-module (ice-9 binary-ports)
-  #:use-module (ice-9 match))
-
-(define test-mix-lock-file
-  "\
-%{
-  \"gen_stage\": {:hex, :gen_stage, \"1.3.2\", \
-\"7c77e5d1e97de2c6c2f78f306f463bca64bf2f4c3cdd606affc0100b89743b7b\", \
-[:mix], [], \"hexpm\", \
-\"0ffae547fa777b3ed889a6b9e1e64566217413d018cabd825f786e843ffe63e7\"},
-  \"eini\": {:hex, :eini_beam, \"2.2.4\", \
-\"02143b1dce4dda4243248e7d9b3d8274b8d9f5a666445e3d868e2cce79e4ff22\", \
-[:rebar3], [], \"hexpm\", \
-\"12de479d144b19e09bb92ba202a7ea716739929afdf9dff01ad802e2b1508471\"},
-  \"erlydtl\": {:git, \"https://github.com/manuel-rubio/erlydtl.git\", \
-\"dffa1a73ee2bfba14195b8b3964c39f007ff1284\", []},
-}")
-
-(define temp-file
-  (string-append "t-mix-" (number->string (getpid))))
-
-(test-begin "mix")
-
-(test-assert "mix-lock-file-import"
-  (begin
-    (call-with-output-file temp-file
-      (lambda (port)
-        (display test-mix-lock-file port)))
-    (mock
-     ((guix scripts download) guix-download
-      (lambda _
-        (format #t "~a~%~a~%"
-                "/gnu/store/m43vixiijc26ni5p9zvbvjrs311h4fsm-erlydtl-dffa1a7"
-                "1jhcfh0idadlh9999kjzx1riqjw0k05wm6ii08xkjvirhjg0vawh")))
-     (let-values
-         (((source-expressions beam-inputs-entry)
-           (mix-lock->expressions temp-file "test")))
-       (and
-        (match source-expressions
-          ('((define beam-gen-stage-1.3.2
-               (hexpm-source
-                "gen_stage" "gen_stage" "1.3.2"
-                "1rv3zqzq8vkqby1bvjhqs09p88b68pkf3fd6i7c3wyvpz93ybyhg"))
-             (define beam-eini-2.2.4
-               (hexpm-source
-                "eini" "eini_beam" "2.2.4"
-                "0wc4a2qy40nq3bqdzygxka93jrvixakh58ibp6dy06ab2jflgphj"))
-             (define beam-erlydtl-snapshot.dffa1a7
-               (origin
-                 (method git-fetch)
-                 (uri (git-reference
-                        (url "https://github.com/manuel-rubio/erlydtl.git")
-                        (commit "dffa1a73ee2bfba14195b8b3964c39f007ff1284")))
-                 (file-name (git-file-name "beam-erlydtl" "snapshot.dffa1a7"))
-                 (sha256
-                  (base32
-                   "1jhcfh0idadlh9999kjzx1riqjw0k05wm6ii08xkjvirhjg0vawh")))))
-           #t)
-          (x
-           (pk 'fail (pretty-print-with-comments (current-output-port) x) #f)))
-        (match beam-inputs-entry
-          (`(test => (list beam-gen-stage-1.3.2
-                           beam-eini-2.2.4
-                           beam-erlydtl-snapshot.dffa1a7))
-           #t)
-          (x
-           (pk 'fail x #f))))))))
-
-(test-end "mix")
-
-(false-if-exception (delete-file temp-file))
@@ -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
Author	SHA1	Message	Date
Gabriel Wicki	ea9401bf1e	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>	2026-04-11 19:10:28 -07:00
Gabriel Wicki	39240c6a87	gnu: linux-libre: Build wireguard and netfilter modules by default. * gnu/packages/linux.scm (default-extra-linux-options): Add module options. (linux-libre-arm64-honeycomb, linux-libre-arm64-mnt-reform-6.19, linux-libre-arm64-mnt-reform-6.18, linux-libre-arm64-mnt-reform-6.12): Remove options. Change-Id: I25655d1c7aa1cd8ccceabbe4d9e0ccc5fa876765 Signed-off-by: Vagrant Cascadian <vagrant@debian.org>	2026-04-11 19:10:24 -07:00
Vagrant Cascadian	35f20275c0	gnu: linux-libre 6.1: Update to 6.1.168. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.168. (linux-libre-6.1-pristine-source): Update hash. Change-Id: I451c59abf88d7603cc1ef9b33f0452f822b3b1d7	2026-04-11 19:05:24 -07:00
Vagrant Cascadian	3f83561fdf	gnu: linux-libre 6.6: Update to 6.6.134. * gnu/packages/linux.scm (linux-libre-6.6-version): Update to 6.6.134. (linux-libre-6.6-pristine-source): Update hash. Change-Id: Ia9c3e1466a37cfdc38816be528c078ab550d52cb	2026-04-11 19:05:21 -07:00
Vagrant Cascadian	c76a119d42	gnu: linux-libre 6.12: Update to 6.12.81. * gnu/packages/linux.scm (linux-libre-6.12-version): Update to 6.12.81. (linux-libre-6.12-pristine-source): Update hash. Change-Id: Ica289eea5726487dbd923c3b8b91f088fca3d93b	2026-04-11 19:05:19 -07:00
Vagrant Cascadian	20e8690310	gnu: linux-libre 6.18: Update to 6.18.22. * gnu/packages/linux.scm (linux-libre-6.18-version): Update to 6.18.22. (linux-libre-6.18-pristine-source): Update hash. Change-Id: I249b4d2b0dcec260a10e7a4a5b1e63ae9869b477	2026-04-11 19:05:15 -07:00
Vagrant Cascadian	9e1e42aa90	gnu: linux-libre 6.19: Update to 6.19.12. * gnu/packages/linux.scm (linux-libre-6.19-version): Update to 6.19.12. (linux-libre-6.19-pristine-source): Update hash. Change-Id: Ibaa1dea8ac75bdc972929dccead39929761eced8	2026-04-11 19:04:50 -07:00
jgart	bda50e3411	gnu: trealla: Update to 2.92.25. * gnu/packages/prolog.scm (trealla): Update to 2.92.25. Change-Id: Idc712573cb14de9a320e74b64a1908d6c82552b0	2026-04-11 18:42:15 -04:00
Cayetano Santos	f1cacebca6	gnu: emacs-calibredb: Add missing paths to binaries. * gnu/packages/emacs-xyz.scm (emacs-calibredb)[arguments]: Complete ’patch-paths #:phase. Change-Id: Idcf372702835e807f9739092fb8b4e3b016035f9	2026-04-11 21:28:34 +02:00
Christopher Baines	6cd5bbd0e9	gnu: guile-knots: Update to 0-32.d79284b. * gnu/packages/guile-xyz.scm (guile-knots): Update to 0-32.d79284b. Change-Id: Ib4dcbecd9b61f68dd2c66e7e74fbb6f126cd320f	2026-04-11 20:02:35 +03:00
Noé Lopez	1078e42a60	tests: Fix non-deterministic AppImage tests. The tested AppImages were not actually relocatable and would rely on items being available on the environment’s store (apart from glibc). * guix/scripts/pack.scm (wrapped-manifest): New function. (guix-pack): Extract relocatable manifest to wrapped-manifest. * tests/pack.scm: Use relocatable profiles in AppImage tests. Fixes: <https://issues.guix.gnu.org/76850> Change-Id: Ib3123054913fce903d215dc0629d806e9fceebc7 Reported-by: Reepca Russelstein <reepca@russelstein.xyz> Signed-off-by: Vagrant Cascadian <vagrant@debian.org>	2026-04-10 18:24:56 -07:00
Noé Lopez	3cbd6bd79c	gnu: appimage-type-2-runtime: Update to continuous-1.caf24f9. The runtime-fuse3 binary was renamed to runtime. * gnu/packages/appimage.scm (appimage-type2-runtime): Update to continuous-1.caf24f9. * guix/scripts/pack.scm (self-contained-appimage): [runtime-path]: Use new runtime name. Change-Id: Ibbb1fcb6ca914764c37addb62c8234b49cc93bd5 Signed-off-by: Vagrant Cascadian <vagrant@debian.org>	2026-04-10 18:24:53 -07:00
Noé Lopez	f303403ec3	gnu: Remove fuse-for-appimage. fuse:static can now be used instead. * gnu/packages/linux.scm (fuse-for-appimage): Remove. * gnu/packages/appimage.scm (appimage-type2-runtime) [inputs]: Replace fuse-for-appimage with fuse:static. * gnu/packages/file-systems.scm (squashfuse-for-appimage): [inputs]: Replace fuse-for-appimage with fuse:static. Change-Id: If3b10bd397eb10d28a8509feca889154bb287f61 Signed-off-by: Vagrant Cascadian <vagrant@debian.org>	2026-04-10 18:24:50 -07:00
Noé Lopez	cd006d069a	gnu: fuse: Build static libraries. * gnu/packages/linux.scm (fuse) [outputs]: Add static output. [arguments]<#:configure-flags>: Build static libraries. <#:phases>: Add phase to install libraries in static output. Change-Id: I9adfa4777174e700de2f5f0b2d43b286c7156313 Signed-off-by: Vagrant Cascadian <vagrant@debian.org>	2026-04-10 18:24:46 -07:00
Noé Lopez	d0a9726a44	gnu: squashfuse: Update to 0.6.1. * gnu/packages/file-systems.scm (squashfuse): Update to 0.6.1. Change-Id: Id589dd7a08a1f1a91ac0547c1a2edaafeaf034b1 Signed-off-by: Vagrant Cascadian <vagrant@debian.org>	2026-04-10 18:24:42 -07:00
Danny Milosavljevic	f32596b598	gnu: Sort 'mesa in lookup-cargo-inputs. * gnu/packages/rust-crates.scm (lookup-cargo-inputs): Order 'mesa container correctly so cargo import doesn't cause churn.	2026-04-10 23:38:36 +02:00
Bean	12822a4aa9	gnu: librecad: Fix desktop integration and icon installation. This patch fixes issue #4120 by ensuring that the .desktop file and application icon are installed to XDG-compliant directories. * gnu/packages/engineering.scm (librecad)[arguments]: Update ’install #:phase. Fixes guix/guix#4120 Merges guix/guix!7677 Change-Id: Ibc8143081dad92ce4f9cba59129302d1fb17d311 Signed-off-by: Cayetano Santos <csantosb@inventati.org> Co-authored-by: Cayetano Santos <csantosb@inventati.org>	2026-04-10 23:26:42 +02:00