revert 7e7487166b

Since commit 7e7487166b, Guix System treats devices starting with "/dev/" as special and won't even try to mount them if the whole string isn't an existing file name.

This strict naming policy is (AFAIK?) Guix-specific and breaks things like booting multi-device bcachefs file systems:

  waiting for partition '/dev/sda1:/dev/sdb1' to appear...
  waiting for partition '/dev/sda1:/dev/sdb1' to appear...

…ad infinitum until crashing to a Guile prompt.

Guix must not enforce custom naming policies like this. On the contrary: we should defer mounting to the kernel whenever possible, and handle failures only when they occur.

We can still delay mounts, retry failed mounts, and try to set up favourable mount conditions based on what we think the mount(2) SOURCE looks like, without adding our own arbitrary rules.

gnu/build/file-systems.scm

@@ -1220,16 +1220,15 @@ file name or an nfs-root containing ':/')."
                   (sleep 1)
                   (loop (+ 1 count))))))))
 
-  (define (device-exists? device)
-    (and (file-exists? device)
-         device))
-
   (match spec
     ((? string?)
-     (if (string-prefix? "/dev/" spec)
+     (if (or (string-contains spec ":/") ;nfs
+             (and (>= (string-length spec) 2)
+                  (equal? (string-take spec 2) "//")) ;cifs
+             (string=? spec "none"))
+         spec                  ; do not resolve NFS / CIFS / tmpfs devices
          ;; Nothing to do, but wait until SPEC shows up.
-         (resolve device-exists? spec identity)
-         spec)) ; do not resolve NFS / CIFS / tmpfs devices
+         (resolve identity spec identity)))
     ((? file-system-label?)
      ;; Resolve the label.
      (resolve find-partition-by-label

gnu/packages/apparmor.scm

@@ -29,6 +29,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages swig)
@@ -92,6 +93,7 @@
            libtool
            perl
            python-minimal
+           python-setuptools
            ruby
            swig-4.0
            which))

gnu/packages/bioinformatics.scm

@@ -6070,17 +6070,16 @@ subgroups.")
 (define-public python-pysam
   (package
     (name "python-pysam")
-    (version "0.23.0")
+    (version "0.23.3")
     (source (origin
               (method git-fetch)
-              ;; Test data is missing on PyPi.
               (uri (git-reference
                     (url "https://github.com/pysam-developers/pysam")
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0hk0ks6kqsm8252d0v1lw2d22x1awmxcr165nnhyacwbqh246skl"))
+                "1kb70fp9mnjl4czhwiahb192lwkq1j357b774ddg533ibj3h7gcz"))
               (modules '((guix build utils)))
               (snippet '(begin
                           ;; FIXME: Unbundle samtools and bcftools.
@@ -6118,10 +6117,9 @@ subgroups.")
     (inputs
      (list ncurses curl zlib))
     (native-inputs
-     (list python-cython-0
+     (list python-cython
            python-pytest
            python-setuptools
-           python-wheel
            ;; Dependencies below are are for tests only.
            samtools
            bcftools))

gnu/packages/check.scm

@@ -2875,19 +2875,27 @@ a Pytest test execution.")
 (define-public python-pytest-mypy-plugins
   (package
     (name "python-pytest-mypy-plugins")
-    (version "3.1.2")
+    (version "4.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytest-mypy-plugins" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/TypedDjango/pytest-mypy-plugins")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1gpynypn13032by633dr2zhng54v2gl09kwgp3ysc4wpwl09pyhl"))))
+        (base32 "05vnv8m4qjrpyxw7f17wng6pnicvaps6vf8c6yn1a8lj10fkwazn"))))
     (build-system pyproject-build-system)
     (arguments
      (list
       #:test-flags
       #~(list "-k" (string-join
                     (list "not reveal_type_extension_is_loaded"
+                          ;; Unsupported operand types for / ("str" and "int")
+                          "test_no_silence_site_packages_only"
+                          "test_no_silence_site_packages_and_modify_pythonpath"
+                          ;; subprocess.CalledProcessError
+                          ;; pytest not found?
                           "test_pyproject_toml"
                           "test_ini_files")
                     " and not "))
@@ -2902,8 +2910,7 @@ a Pytest test execution.")
                 (with-directory-excursion "/tmp"
                   (apply invoke "pytest" "-v" test-flags))))))))
     (native-inputs
-     (list python-setuptools
-           python-wheel))
+     (list python-setuptools))
     (propagated-inputs
      (list python-decorator
            python-jinja2

gnu/packages/crypto.scm

@@ -264,7 +264,7 @@ fast, secure, parallelizable, capable of incremental updates.")
                                (string-append
                                 "--prefix="
                                 (python:site-packages inputs outputs)))))))))
-      (native-inputs (list python-minimal-wrapper))
+      (native-inputs (list python-minimal-wrapper python-setuptools))
       (synopsis "Decaf Elliptic Curve Library")
       (description "The libdecaf library is an implementation of elliptic curve
 cryptography using the Montgomery and Edwards curves Curve25519, Ed25519,

gnu/packages/dav.scm

@@ -169,43 +169,29 @@ clients.")
 (define-public xandikos
   (package
     (name "xandikos")
-    (version "0.3.0")
+    (version "0.3.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri "xandikos" version))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/jelmer/xandikos")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "10j7qmwcrwql4ah6q8si3nf1ljwrx99w8ipiy85bzjd3qz2vackj"))))
+        (base32 "0db02hsdrrxpms9xfy8q5kkgsp5gxrgd15rgdjd5aw7lqpnhhmji"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      #:test-backend #~'unittest
       #:phases
       #~(modify-phases %standard-phases
-          (replace 'create-entrypoints
-            (lambda* (#:key inputs outputs #:allow-other-keys)
-              (let ((sitedir (site-packages inputs outputs))
-                    (interpreter (which "python"))
-                    (file-path (string-append #$output "/bin/xandikos")))
-                (mkdir-p (string-append #$output "/bin"))
-                (call-with-output-file file-path
-                  (lambda (port)
-                    (format port "#!~a -sP
-# Auto-generated entry point script.
-import sys
-import asyncio
-from xandikos.__main__ import main
-if __name__ == '__main__':
-    sys.exit(asyncio.run(main(sys.argv[1:])))~%" interpreter)))
-                (chmod file-path #o755))))
           (add-before 'check 'check-setup
             (lambda _
               (setenv "XANDIKOSPATH" (mkdtemp "/tmp/xandikospath-XXXXXX")))))))
-    (native-inputs (list python-setuptools))
+    (native-inputs (list python-pytest python-setuptools))
     (propagated-inputs
      (list python-aiohttp
            python-defusedxml
-           python-dulwich-0.24
+           python-dulwich
            python-icalendar
            python-jinja2
            python-multidict

gnu/packages/emacs-xyz.scm

@@ -24500,7 +24500,7 @@ It should enable you to implement low-level X11 applications.")
                   (lambda _
                     (format #t "#!~a ~@
                      ~a +SI:localuser:$USER ~@
-                     exec ~a --exit-with-session ~a \"$@\" --eval '~s' ~%"
+                     exec ~a --exit-with-session ~a \"$@\" -mm --eval '~s' ~%"
                             (search-input-file inputs "/bin/sh")
                             (search-input-file inputs "/bin/xhost")
                             (search-input-file inputs "/bin/dbus-launch")
@@ -24510,7 +24510,7 @@ It should enable you to implement low-level X11 applications.")
                                (load-file "~/.exwm"))
                               ((not (featurep 'exwm))
                                (require 'exwm)
-                               (exwm-enable)
+                               (exwm-wm-mode)
                                (message
                                 "exwm configuration not found.
 Falling back to minimal configuration.

gnu/packages/language.scm

@@ -378,7 +378,8 @@ method, one of the most popular choices for Traditional Chinese users.")
            texinfo
            perl
            pkg-config
-           python-minimal))
+           python-minimal
+           python-setuptools))
     (synopsis "Braille translator and back-translator")
     (description "Liblouis is a braille translator and back-translator named in
 honor of Louis Braille.  It features support for computer and literary braille,

gnu/packages/librewolf.scm

@@ -125,14 +125,14 @@
   ;; ex:
   ;; tar xf /gnu/store/...-firefox-123.4.source.tar.xz -O \
   ;;     firefox-123.4/browser/locales/l10n-changesets.json | grep revision
-  (let ((commit "c316776e57fcf5c11054c115054b083ce0790ce7"))
+  (let ((commit "d1394212aed0ce0063c0f818aa236e7d4f955ac9"))
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/mozilla-l10n/firefox-l10n.git")
             (commit commit)))
       (file-name (git-file-name "firefox-l10n" commit))
-      (sha256 (base32 "19ph6rj4s5f1vdmkifk2n1lb2lnlps87miy49552x5czxy40wwh4")))))
+      (sha256 (base32 "16s515xf0i7a7acv0m1bbgflbdx9a87b1dcg7q3yswym8x1bhvaj")))))
 
 (define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n)
   (let* ((ff-src (firefox-source-origin
@@ -238,23 +238,23 @@
 ;;; but since in Guix only the latest packaged Rust is officially supported,
 ;;; it is a tradeoff worth making.
 ;;; 0: https://firefox-source-docs.mozilla.org/writing-rust-code/update-policy.html
-(define rust-librewolf rust-1.92)
+(define rust-librewolf rust-1.93)
 
 ;; Update this id with every update to its release date.
 ;; It's used for cache validation and therefore can lead to strange bugs.
 ;; ex: date '+%Y%m%d%H%M%S'
 ;; or: (format-time-string "%Y%m%d%H%M%S")
-(define %librewolf-build-id "20260319204056")
+(define %librewolf-build-id "20260326135749")
 
 (define-public librewolf
   (package
     (name "librewolf")
-    (version "148.0.2-3")
+    (version "149.0-1")
     (source
      (make-librewolf-source
       #:version version
-      #:firefox-hash "142f4k4ykcm65kbvj60p472103r4k79v9fdsfljdav2rbr6qxjx6"
-      #:librewolf-hash "193yh89chifcvqn03h9xs39g0pdiiamzb4wjf8f7qczgc23b7y8w"
+      #:firefox-hash "12jb930qhqhpzjpn5smms7g4n6y40zvxcrg8w42696wxk7pgsqdq"
+      #:librewolf-hash "0igv0fr0vl2nf5rlgnidfz2a3gh55bsqwcray0jg7x2kl6qnkzwm"
       #:l10n firefox-l10n))
     (build-system gnu-build-system)
     (arguments

gnu/packages/llvm.scm

@@ -2083,6 +2083,8 @@ generator targetting AMD hardware.")
                          (substitute* "clang/cindex.py"
                            (("libclang\\.so") libclang))))))))
     (inputs (list clang))
+    (native-inputs (modify-inputs (package-native-inputs clang)
+                     (append python-setuptools)))
     (synopsis "Python bindings to libclang")))
 
 (define-public python-clang-12

gnu/packages/prolog.scm

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

gnu/packages/python-build.scm

@@ -1067,30 +1067,6 @@ any dependency management.  It aims to keep dependencies to a minimum, in
 order to make bootstrapping easier.")
     (license license:expat)))
 
-;; There are quite a few amount of Python installers in the wild we need the
-;; one from PyPa team.
-(define-public python-pypa-installer
-  (package
-    (name "python-pypa-installer")
-    (version "0.7.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "installer" version))
-       (sha256
-        (base32 "0cdnqh3a3amw8k4s1pzfjh0hpvzw4pczgl702s1b16r82qqkwvd2"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f)) ; Depends on pytest, which we cannot import into this module.
-    (native-inputs
-     (list python-flit-core))
-    (home-page "https://installer.readthedocs.io/")
-    (synopsis "low-level library for installing from a Python wheel distribution")
-    (description
-     "This package provides a library for installing Python wheels.")
-    (license license:expat)))
-
 (define-public python-poetry-core
   (package
     (name "python-poetry-core")
@@ -1526,6 +1502,10 @@ package from a wheel distribution.  It provides basic functionality and
 abstractions for handling wheels and installing packages from wheels.")
     (license license:expat)))
 
+;; Both packages have been merged into a single one.
+(define-deprecated-package python-pypa-installer
+  python-installer)
+
 (define-public python-jaraco-classes
   (package
     (name "python-jaraco-classes")

gnu/packages/python-xyz.scm

@@ -6074,6 +6074,15 @@ commonly used storage backends.")
         (base32
          "0snprxdnh3m45r3b0az4v0l28h90ycmfbybzla6xg1qviwv9w1ak"))))
     (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-tests
+            (lambda _
+              (substitute* "tests/test_match.py"
+                (("assertRaisesRegexp")
+                 "assertRaisesRegex")))))))
     (native-inputs
      (list python-pytest python-setuptools))
     (inputs
@@ -16527,22 +16536,21 @@ TODO notes checker plugin for flake8.")
 (define-public python-flake8-isort
   (package
     (name "python-flake8-isort")
-    (version "6.1.1")
+    (version "7.0.0")
     (source
       (origin
-        (method url-fetch)
-        (uri (pypi-uri "flake8_isort" version))
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/gforcada/flake8-isort")
+               (commit version)))
+        (file-name (git-file-name name version))
         (sha256
-          (base32 "1cvh0d18scgq36gqa2vqbifjarln1r3axgq93lzc303ay0y2zy61"))))
+         (base32 "0d7j2ws59bm9143m69ah6h865i2pn97p4gjpwx6jrwi9sy26kj5z"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f)) ; no tests in PiPY or git checkout
-    (native-inputs
-     (list python-hatchling))
-    (propagated-inputs
-     (list python-flake8
-           python-isort))
+    (arguments (list #:test-backend #~'custom
+                     #:test-flags #~(list "run_tests.py")))
+    (native-inputs (list python-hatchling python-pytest))
+    (propagated-inputs (list python-flake8 python-isort))
     (home-page "https://github.com/gforcada/flake8-isort")
     (synopsis "Flake8 plugin integrating isort")
     (description