Merge branch 'typo-fixes-20211114'
build: wrap-qt-program: Fix typo.
* gnu/build/qt-utils.scm (wrap-qt-program): Fix spelling of "program".
gnu: scandb: Fix typo.
* gnu/packages/emacs-xyz.scm (scandb)[description]: Fix spelling of
"regularly".
gnu: MPD: Update to 0.23.4.
* gnu/packages/mpd.scm (mpd): Update to 0.23.4.
[arguments]: Use meson-next for meson-build-system.
[inputs]: Add fmt.
[native-inputs]: Add cmake.
[properties]: Add release-monitoring-url.
gnu: python-cligj: Fix typo.
* gnu/packages/emacs-xyz.scm (python-cligj)[description]: Fix spelling of
"command".
gnu: ghc-quickcheck-classes-base: Fix typo.
* gnu/packages/emacs-xyz.scm (ghc-quickcheck-classes-base)[description]: Fix
spelling of "library"
gnu: emacs-org-contrib: Fix typo.
* gnu/packages/emacs-xyz.scm (emacs-org-contrib)[description]: Fix spelling of
"maintenance".
gnu: rust-fallible-collections-0.4: Fix typo.
* gnu/packages/crates-io.scm (rust-fallible-collections-0.4)[description]: Fix
spelling of "which".
gnu: r-msfeatures: Fix typo.
* gnu/packages/bioconductor.scm (r-msfeatures)[description]: Fix spelling of
"package".
gnu: home: services: Fix typo.
* gnu/home/services/xdg.scm (home-xdg-base-directories-service-type): Fix
spelling of "convenient".
gnu: home: services: Fix typo.
* gnu/home/services/utils.scm: Fix spelling of "anything".
gnu: home: services: Fix typo.
* gnu/home/services/shells.scm (home-shell-profile-configuration): Fix
spelling of "available".
home: services: Typo fix.
* gnu/home/services.scm: Fix spelling of "directory".
gnu: python-uritemplate: Update to 4.1.1.
* gnu/packages/python-web.scm (python-uritemplate): Update to 4.1.1.
[license]: Add LICENSE:ASL2.0.
(python2-uritemplate): Remove variable.
gnu: Remove python2-google-api-client.
Some of its dependencies no longer support Python 2.
* gnu/packages/python-web.scm (python2-google-api-client): Remove variable.
gnu: python-sqlalchemy: Update to 1.4.27.
* gnu/packages/databases.scm (python-sqlalchemy): Update to 1.4.27.
gnu: python-psycopg2: Update to 2.9.2.
* gnu/packages/databases.scm (python-psycopg2): Update to 2.9.2.
(python2-psycopg2): Remove variable (no longer supported).
gnu: python-pyasn1-modules: Update to 0.2.8.
* gnu/packages/python-xyz.scm (python-pyasn1-modules): Update to 0.2.8.
gnu: Remove python2-sqlalchemy-utils.
Some of its dependencies no longer support Python 2, so drop it.
* gnu/packages/databases.scm (python2-sqlalchemy-utils): Remove variable.
environment: Fix ‘--check’ with exported PS1 variable.
If your .bashrc (unnecessarily) exports PS1 and you’re in a non-login
shell, Guix crashes:
user@popigai:~$ guix shell --check coreutils
guix shell: checking the environment variables visible from shell '/bin/bash'...
Backtrace:
14 (primitive-load "/home/user/.config/guix/current/bin/g…")
In guix/ui.scm:
2206:7 13 (run-guix . _)
2169:10 12 (run-guix-command _ . _)
In ice-9/boot-9.scm:
1752:10 11 (with-exception-handler _ _ #:unwind? _ # _)
1752:10 10 (with-exception-handler _ _ #:unwind? _ # _)
In guix/store.scm:
658:37 9 (thunk)
1320:8 8 (call-with-build-handler _ _)
1320:8 7 (call-with-build-handler #<procedure 7fe393b7c420 at g…> …)
In guix/status.scm:
800:4 6 (call-with-status-report _ _)
In guix/scripts/environment.scm:
951:12 5 (_)
In guix/store.scm:
2119:24 4 (run-with-store #<store-connection 256.99 7fe39627e500> …)
In guix/scripts/environment.scm:
521:35 3 (_ _)
In unknown file:
2 (string=? ("PS1" . "${debian_chroot:+($debian_chroot)…") …)
In ice-9/boot-9.scm:
1685:16 1 (raise-exception _ #:continuable? _)
1685:16 0 (raise-exception _ #:continuable? _)
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
In procedure string=: Wrong type argument in position 1 (expecting string): ("PS1" . "${debian_chroot:+($debian_chroot)}\\[\\033[01;32m\\]\\u@\\h\\[\\033[00m\\]:\\[\\033[01;34m\\]\\w\\[\\033[00m\\]${EXTRA}\\$ ")
user@popigai:~$
This is because the match pattern doesn’t expect `(vhash-assoc "PS1" actual)`
to return a pair.
* guix/scripts/environment.scm (validate-child-shell-environment): Change
match pattern to expect a pair.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>