diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-18 16:30:21 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-18 16:30:21 +0200 |
| commit | 80c76f5d8eaa0aff40c08eac19a62e0e7957a7c8 (patch) | |
| tree | 68938c2e5ed14adc2af9ef9be6691b1948175f39 /gnu | |
| parent | cbe461f2d497554fd667429cd9db5ee990c7fadb (diff) | |
| parent | 2266ec5eb1bcc2c87baa27297a4205eebf325424 (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 3 | ||||
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 251 | ||||
| -rw-r--r-- | gnu/packages/emacs.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/fontutils.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/geo.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/gstreamer.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/image-processing.scm | 22 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 32 | ||||
| -rw-r--r-- | gnu/packages/messaging.scm | 76 | ||||
| -rw-r--r-- | gnu/packages/ntp.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/patches/emacs-pgtk-super-key-fix.patch | 49 | ||||
| -rw-r--r-- | gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch | 37 | ||||
| -rw-r--r-- | gnu/packages/pdf.scm | 60 | ||||
| -rw-r--r-- | gnu/packages/php.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/plotutils.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/python-science.scm | 4 | ||||
| -rw-r--r-- | gnu/services/desktop.scm | 23 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 23 |
19 files changed, 495 insertions, 145 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 094012316f6..99034149c9d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -52,6 +52,7 @@ | |||
| 52 | # Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> | 52 | # Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> |
| 53 | # Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> | 53 | # Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> |
| 54 | # Copyright © 2022 muradm <mail@muradm.net> | 54 | # Copyright © 2022 muradm <mail@muradm.net> |
| 55 | # Copyright © 2022 Hilton Chain <hako@ultrarare.space> | ||
| 55 | # | 56 | # |
| 56 | # This file is part of GNU Guix. | 57 | # This file is part of GNU Guix. |
| 57 | # | 58 | # |
| @@ -1038,12 +1039,14 @@ dist_patch_DATA = \ | |||
| 1038 | %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ | 1039 | %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ |
| 1039 | %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ | 1040 | %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ |
| 1040 | %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ | 1041 | %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ |
| 1042 | %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ | ||
| 1041 | %D%/packages/patches/emacs-source-date-epoch.patch \ | 1043 | %D%/packages/patches/emacs-source-date-epoch.patch \ |
| 1042 | %D%/packages/patches/emacs-telega-path-placeholder.patch \ | 1044 | %D%/packages/patches/emacs-telega-path-placeholder.patch \ |
| 1043 | %D%/packages/patches/emacs-telega-test-env.patch \ | 1045 | %D%/packages/patches/emacs-telega-test-env.patch \ |
| 1044 | %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ | 1046 | %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ |
| 1045 | %D%/packages/patches/emacs-yasnippet-fix-tests.patch \ | 1047 | %D%/packages/patches/emacs-yasnippet-fix-tests.patch \ |
| 1046 | %D%/packages/patches/emacs-kv-fix-tests.patch \ | 1048 | %D%/packages/patches/emacs-kv-fix-tests.patch \ |
| 1049 | %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ | ||
| 1047 | %D%/packages/patches/enjarify-setup-py.patch \ | 1050 | %D%/packages/patches/enjarify-setup-py.patch \ |
| 1048 | %D%/packages/patches/enlightenment-fix-setuid-path.patch \ | 1051 | %D%/packages/patches/enlightenment-fix-setuid-path.patch \ |
| 1049 | %D%/packages/patches/erlang-man-path.patch \ | 1052 | %D%/packages/patches/erlang-man-path.patch \ |
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5aff012adb5..30bd0ca48b2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm | |||
| @@ -1348,6 +1348,28 @@ color scheme used by Visual Studio Code.") | |||
| 1348 | Apprentice and Sourcerer.") | 1348 | Apprentice and Sourcerer.") |
| 1349 | (license license:gpl3+)))) | 1349 | (license license:gpl3+)))) |
| 1350 | 1350 | ||
| 1351 | (define-public emacs-suneater-theme | ||
| 1352 | (package | ||
| 1353 | (name "emacs-suneater-theme") | ||
| 1354 | (version "2.0.0") | ||
| 1355 | (source | ||
| 1356 | (origin | ||
| 1357 | (method git-fetch) | ||
| 1358 | (uri (git-reference | ||
| 1359 | (url "https://git.sr.ht/~plattfot/suneater-theme") | ||
| 1360 | (commit version))) | ||
| 1361 | (sha256 | ||
| 1362 | (base32 | ||
| 1363 | "0nlam8f8ly86y7p2dn10y9ixnm7bhmigsx7si4cjynh6aiyczyds")) | ||
| 1364 | (file-name (git-file-name name version)))) | ||
| 1365 | (build-system emacs-build-system) | ||
| 1366 | (home-page "https://git.sr.ht/~plattfot/suneater-theme") | ||
| 1367 | (synopsis "Minimalistic dark theme for Emacs") | ||
| 1368 | (description | ||
| 1369 | "Suneater is a dark, minimalistic Emacs theme. It was based on Sunburst | ||
| 1370 | theme but now takes more inspiration from the Nano theme.") | ||
| 1371 | (license license:gpl3+))) | ||
| 1372 | |||
| 1351 | (define-public emacs-treepy | 1373 | (define-public emacs-treepy |
| 1352 | (package | 1374 | (package |
| 1353 | (name "emacs-treepy") | 1375 | (name "emacs-treepy") |
| @@ -2572,6 +2594,30 @@ light user interface.") | |||
| 2572 | within a specified width. It is useful for displaying long track titles.") | 2594 | within a specified width. It is useful for displaying long track titles.") |
| 2573 | (license license:gpl3+))) | 2595 | (license license:gpl3+))) |
| 2574 | 2596 | ||
| 2597 | (define-public emacs-emprise | ||
| 2598 | (package | ||
| 2599 | (name "emacs-emprise") | ||
| 2600 | (version "0.3.0") | ||
| 2601 | (source | ||
| 2602 | (origin | ||
| 2603 | (method git-fetch) | ||
| 2604 | (uri (git-reference | ||
| 2605 | (url "https://git.sr.ht/~plattfot/emprise") | ||
| 2606 | (commit (string-append "v" version)))) | ||
| 2607 | (sha256 | ||
| 2608 | (base32 | ||
| 2609 | "0yddvvpjdcgsiwv24jbddkgl5r1lxgz037akjln6z9acx9qrc8px")) | ||
| 2610 | (file-name (git-file-name name version)))) | ||
| 2611 | (build-system emacs-build-system) | ||
| 2612 | (home-page "https://sr.ht/~plattfot/emprise") | ||
| 2613 | (synopsis "Control MPRIS supported media players from Emacs") | ||
| 2614 | (description "This package provides a set of commands to control media | ||
| 2615 | players that supports the Media Player Remote Interfacing | ||
| 2616 | Specification (MPRIS) protocol from Emacs. It uses Emacs' Completing Read | ||
| 2617 | framework as the user interface, which integrates well with Vertico or | ||
| 2618 | Selectrum.") | ||
| 2619 | (license license:gpl3+))) | ||
| 2620 | |||
| 2575 | 2621 | ||
| 2576 | ;;; | 2622 | ;;; |
| 2577 | ;;; Miscellaneous. | 2623 | ;;; Miscellaneous. |
| @@ -2605,6 +2651,31 @@ This package turns this into an O(1) operation. It does so by assigning a | |||
| 2605 | letter to each link using avy.") | 2651 | letter to each link using avy.") |
| 2606 | (license license:gpl3+))) | 2652 | (license license:gpl3+))) |
| 2607 | 2653 | ||
| 2654 | (define-public emacs-app-launcher | ||
| 2655 | ;; XXX: Upstream did not tag any commit so far. Base version is extracted | ||
| 2656 | ;; from Version keyword. | ||
| 2657 | (let ((commit "d5015e394b0a666a8c7c4d4bdf786266e773b145") | ||
| 2658 | (revision "0")) | ||
| 2659 | (package | ||
| 2660 | (name "emacs-app-launcher") | ||
| 2661 | (version (git-version "0.1" revision commit)) | ||
| 2662 | (source | ||
| 2663 | (origin | ||
| 2664 | (method git-fetch) | ||
| 2665 | (uri (git-reference | ||
| 2666 | (url "https://github.com/SebastienWae/app-launcher") | ||
| 2667 | (commit commit))) | ||
| 2668 | (file-name (git-file-name name version)) | ||
| 2669 | (sha256 | ||
| 2670 | (base32 "0l97ajy27awydyd4gc6323wyhpm5vm2db6i0lp5gqaxi9fp7jivp")))) | ||
| 2671 | (build-system emacs-build-system) | ||
| 2672 | (home-page "https://github.com/SebastienWae/app-launcher") | ||
| 2673 | (synopsis "Use Emacs standard completion to launch applications") | ||
| 2674 | (description "This package defines the @code{app-launcher-run-app} | ||
| 2675 | command, which uses Emacs standard completion to select an application | ||
| 2676 | installed on your machine and launch it.") | ||
| 2677 | (license license:gpl3+)))) | ||
| 2678 | |||
| 2608 | (define-public emacs-auto-sudoedit | 2679 | (define-public emacs-auto-sudoedit |
| 2609 | (package | 2680 | (package |
| 2610 | (name "emacs-auto-sudoedit") | 2681 | (name "emacs-auto-sudoedit") |
| @@ -6162,6 +6233,64 @@ and retrieving information using the SQLite program through Elisp programming. | |||
| 6162 | It is not intended as a user interface.") | 6233 | It is not intended as a user interface.") |
| 6163 | (license license:gpl3+)))) | 6234 | (license license:gpl3+)))) |
| 6164 | 6235 | ||
| 6236 | (define-public emacs-sqlite3-api | ||
| 6237 | (package | ||
| 6238 | (name "emacs-sqlite3-api") | ||
| 6239 | (version "0.16") | ||
| 6240 | (source (origin | ||
| 6241 | (method git-fetch) | ||
| 6242 | (uri (git-reference | ||
| 6243 | (url "https://github.com/pekingduck/emacs-sqlite3-api") | ||
| 6244 | (commit (string-append "v" version)))) | ||
| 6245 | (file-name (git-file-name name version)) | ||
| 6246 | (sha256 | ||
| 6247 | (base32 | ||
| 6248 | "0yrfwb3yvhp1ib4izxh1ds68b3zw8gjkjhlk1kivarxnfjnjnly2")))) | ||
| 6249 | (build-system emacs-build-system) | ||
| 6250 | (arguments | ||
| 6251 | (list | ||
| 6252 | #:tests? (not (%current-target-system)) | ||
| 6253 | #:test-command #~(list "make" "test" "EMACS=emacs") | ||
| 6254 | #:modules '((guix build emacs-build-system) | ||
| 6255 | (guix build emacs-utils) | ||
| 6256 | (guix build utils)) | ||
| 6257 | #:phases | ||
| 6258 | #~(modify-phases %standard-phases | ||
| 6259 | (add-after 'unpack 'patch-module-load | ||
| 6260 | (lambda _ | ||
| 6261 | (make-file-writable "sqlite3.el") | ||
| 6262 | (emacs-substitute-sexps "sqlite3.el" | ||
| 6263 | ("(require 'sqlite3-api nil t)" | ||
| 6264 | (string-append | ||
| 6265 | "(module-load \"" #$output "/lib/sqlite3-api.so\")"))))) | ||
| 6266 | (add-before 'check 'build-emacs-module | ||
| 6267 | (lambda _ | ||
| 6268 | ;; Remove code that fetches constants from the SQLite website | ||
| 6269 | ;; and the call to generate a timestamp. | ||
| 6270 | (invoke "sed" "--in-place" "3,4d;24,28d;31d" "tools/gen-consts.sh") | ||
| 6271 | ;; Remove filter logic from the script that generates the constants. | ||
| 6272 | (invoke "sed" "--in-place" "7,11d;18,22d" "tools/gen-consts.py") | ||
| 6273 | ;; Generate the consts.c file. | ||
| 6274 | (invoke "make" "--directory=tools") | ||
| 6275 | ;; Remove the SQLITE_STATIC and SQLITE_TRANSIENT | ||
| 6276 | ;; constants. They cause a compilation warning and would have | ||
| 6277 | ;; been removed by the original script. | ||
| 6278 | (invoke "sed" "--in-place" "/ifdef SQLITE_STATIC/,+2d" "consts.c") | ||
| 6279 | (invoke "sed" "--in-place" "/ifdef SQLITE_TRANSIENT/,+2d" "consts.c") | ||
| 6280 | ;; Compile the shared object file. | ||
| 6281 | (invoke "make" #$(string-append "CC=" (cc-for-target))) | ||
| 6282 | ;; Move the shared object file into /lib. | ||
| 6283 | (install-file "sqlite3-api.so" | ||
| 6284 | (string-append #$output "/lib"))))))) | ||
| 6285 | (native-inputs (list python sed)) | ||
| 6286 | (inputs (list sqlite)) | ||
| 6287 | (home-page "https://github.com/pekingduck/emacs-sqlite3-api") | ||
| 6288 | (synopsis "Dynamic module for Emacs to access the SQLite C interface") | ||
| 6289 | (description "This package provides a dynamic module for Emacs that allows | ||
| 6290 | direct access to the SQLite C interface. It only exposes a subset of the full | ||
| 6291 | SQLite C interface, but should satisfy most user's needs.") | ||
| 6292 | (license license:gpl3+))) | ||
| 6293 | |||
| 6165 | (define-public emacs-sr-speedbar | 6294 | (define-public emacs-sr-speedbar |
| 6166 | (let ((commit "77a83fb50f763a465c021eca7343243f465b4a47") | 6295 | (let ((commit "77a83fb50f763a465c021eca7343243f465b4a47") |
| 6167 | (revision "0")) | 6296 | (revision "0")) |
| @@ -6725,14 +6854,14 @@ user.") | |||
| 6725 | (define-public emacs-subed | 6854 | (define-public emacs-subed |
| 6726 | (package | 6855 | (package |
| 6727 | (name "emacs-subed") | 6856 | (name "emacs-subed") |
| 6728 | (version "1.0.8") | 6857 | (version "1.0.9") |
| 6729 | (source (origin | 6858 | (source (origin |
| 6730 | (method url-fetch) | 6859 | (method url-fetch) |
| 6731 | (uri (string-append "https://elpa.nongnu.org/nongnu/subed-" | 6860 | (uri (string-append "https://elpa.nongnu.org/nongnu/subed-" |
| 6732 | version ".tar")) | 6861 | version ".tar")) |
| 6733 | (sha256 | 6862 | (sha256 |
| 6734 | (base32 | 6863 | (base32 |
| 6735 | "05dx4ywma7n73d0cihf4v8ayihm7gmfqpzvdycq4yk0zkxb958z1")))) | 6864 | "192m7pg8hiqx7ppr1sk6n5qjcbz78dmcg6m14syq12ll07zfpcm0")))) |
| 6736 | (arguments | 6865 | (arguments |
| 6737 | (list | 6866 | (list |
| 6738 | #:tests? #t | 6867 | #:tests? #t |
| @@ -15755,7 +15884,7 @@ gnugo-image-display-mode}.") | |||
| 15755 | (define-public emacs-transpose-frame | 15884 | (define-public emacs-transpose-frame |
| 15756 | (package | 15885 | (package |
| 15757 | (name "emacs-transpose-frame") | 15886 | (name "emacs-transpose-frame") |
| 15758 | (version "0.2.0") | 15887 | (version "0.2.1") |
| 15759 | (source | 15888 | (source |
| 15760 | (origin | 15889 | (origin |
| 15761 | (method git-fetch) | 15890 | (method git-fetch) |
| @@ -15764,7 +15893,7 @@ gnugo-image-display-mode}.") | |||
| 15764 | (commit (string-append "v" version)))) | 15893 | (commit (string-append "v" version)))) |
| 15765 | (file-name (git-file-name name version)) | 15894 | (file-name (git-file-name name version)) |
| 15766 | (sha256 | 15895 | (sha256 |
| 15767 | (base32 "01j4ci0c52r2c31hc9r4p7nsb6s8blmvg50g9n5v5h3afjl1c35v")))) | 15896 | (base32 "0m9jmfwwhgkwxbq3y000ymx7parbgqr7gq3yjm2wh1ll747gv51y")))) |
| 15768 | (build-system emacs-build-system) | 15897 | (build-system emacs-build-system) |
| 15769 | (home-page "https://www.emacswiki.org/emacs/TransposeFrame") | 15898 | (home-page "https://www.emacswiki.org/emacs/TransposeFrame") |
| 15770 | (synopsis "Transpose window arrangement in current frame") | 15899 | (synopsis "Transpose window arrangement in current frame") |
| @@ -15773,6 +15902,31 @@ functions which allows users to transpose windows arrangement in currently | |||
| 15773 | selected frame.") | 15902 | selected frame.") |
| 15774 | (license license:bsd-2))) | 15903 | (license license:bsd-2))) |
| 15775 | 15904 | ||
| 15905 | (define-public emacs-transpose-mark | ||
| 15906 | ;; XXX: Upstream made no release so far, and did not add a Version keyword. | ||
| 15907 | (let ((commit "667327602004794de97214cf336ac61650ef75b7") | ||
| 15908 | (revision "0")) | ||
| 15909 | (package | ||
| 15910 | (name "emacs-transpose-mark") | ||
| 15911 | (version (git-version "0" revision commit)) | ||
| 15912 | (source | ||
| 15913 | (origin | ||
| 15914 | (method git-fetch) | ||
| 15915 | (uri (git-reference | ||
| 15916 | (url "https://github.com/kwrooijen/transpose-mark") | ||
| 15917 | (commit commit))) | ||
| 15918 | (file-name (git-file-name name version)) | ||
| 15919 | (sha256 | ||
| 15920 | (base32 "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x")))) | ||
| 15921 | (build-system emacs-build-system) | ||
| 15922 | (home-page "https://github.com/kwrooijen/transpose-mark") | ||
| 15923 | (synopsis "Library for transposing lines and regions") | ||
| 15924 | (description "Transpose mark provides some commands that makes | ||
| 15925 | transposing lines and regions easier. You can mark a line and transpose it | ||
| 15926 | with a line at point, or mark a region and transpose it with another region | ||
| 15927 | a point. The plugin provides visual feedback for marked regions.") | ||
| 15928 | (license license:gpl3+)))) | ||
| 15929 | |||
| 15776 | (define-public emacs-key-chord | 15930 | (define-public emacs-key-chord |
| 15777 | (package | 15931 | (package |
| 15778 | (name "emacs-key-chord") | 15932 | (name "emacs-key-chord") |
| @@ -16574,7 +16728,7 @@ which avoids some of the issues with using Emacs’s built-in Url library.") | |||
| 16574 | (define-public emacs-ement | 16728 | (define-public emacs-ement |
| 16575 | (package | 16729 | (package |
| 16576 | (name "emacs-ement") | 16730 | (name "emacs-ement") |
| 16577 | (version "0.1.3") | 16731 | (version "0.1.4") |
| 16578 | (source | 16732 | (source |
| 16579 | (origin | 16733 | (origin |
| 16580 | (method git-fetch) | 16734 | (method git-fetch) |
| @@ -16583,7 +16737,7 @@ which avoids some of the issues with using Emacs’s built-in Url library.") | |||
| 16583 | (commit (string-append "v" version)))) | 16737 | (commit (string-append "v" version)))) |
| 16584 | (file-name (git-file-name name version)) | 16738 | (file-name (git-file-name name version)) |
| 16585 | (sha256 | 16739 | (sha256 |
| 16586 | (base32 "075mwlc616rr86zgli36n6r8w09c5cvlk43by0f1xzla5rmiza8r")))) | 16740 | (base32 "1kms6l14h6ig8kphzpkxv16z7gpvcwvcfsp5ljssdnrx0c7dzz16")))) |
| 16587 | (build-system emacs-build-system) | 16741 | (build-system emacs-build-system) |
| 16588 | (arguments | 16742 | (arguments |
| 16589 | `(#:emacs ,emacs)) ;need libxml support | 16743 | `(#:emacs ,emacs)) ;need libxml support |
| @@ -17525,7 +17679,10 @@ contexts. | |||
| 17525 | (commit (string-append "v" version)))) | 17679 | (commit (string-append "v" version)))) |
| 17526 | (file-name (git-file-name name version)) | 17680 | (file-name (git-file-name name version)) |
| 17527 | (sha256 | 17681 | (sha256 |
| 17528 | (base32 "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn")))) | 17682 | (base32 "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn")) |
| 17683 | (patches | ||
| 17684 | ;; XXX: Cherry-picked from upstream, remove when bumping to 0.2.3. | ||
| 17685 | (search-patches "emacs-polymode-fix-lexical-variable-error.patch")))) | ||
| 17529 | (build-system emacs-build-system) | 17686 | (build-system emacs-build-system) |
| 17530 | (home-page "https://github.com/polymode/polymode") | 17687 | (home-page "https://github.com/polymode/polymode") |
| 17531 | (synopsis "Framework for multiple Emacs modes based on indirect buffers") | 17688 | (synopsis "Framework for multiple Emacs modes based on indirect buffers") |
| @@ -19292,7 +19449,7 @@ files to be expanded upon opening them.") | |||
| 19292 | (define-public emacs-parsebib | 19449 | (define-public emacs-parsebib |
| 19293 | (package | 19450 | (package |
| 19294 | (name "emacs-parsebib") | 19451 | (name "emacs-parsebib") |
| 19295 | (version "4.2") | 19452 | (version "4.3") |
| 19296 | (source | 19453 | (source |
| 19297 | (origin | 19454 | (origin |
| 19298 | (method git-fetch) | 19455 | (method git-fetch) |
| @@ -19301,7 +19458,7 @@ files to be expanded upon opening them.") | |||
| 19301 | (commit version))) | 19458 | (commit version))) |
| 19302 | (file-name (git-file-name name version)) | 19459 | (file-name (git-file-name name version)) |
| 19303 | (sha256 | 19460 | (sha256 |
| 19304 | (base32 "0da4b6d65bq9xhyhq7h9g315zg6g5q9435vz870la966rgav5szd")))) | 19461 | (base32 "0vcl2wvxwpr62c9ym0fm3qaxzhjcrpk4r6r0zaqhkvlf8qr3rg8y")))) |
| 19305 | (build-system emacs-build-system) | 19462 | (build-system emacs-build-system) |
| 19306 | (home-page "https://github.com/joostkremers/parsebib") | 19463 | (home-page "https://github.com/joostkremers/parsebib") |
| 19307 | (synopsis "Library for parsing @file{.bib} files") | 19464 | (synopsis "Library for parsing @file{.bib} files") |
| @@ -19619,7 +19776,7 @@ that it can display an error message showing how the parser fails.") | |||
| 19619 | (define-public emacs-move-text | 19776 | (define-public emacs-move-text |
| 19620 | (package | 19777 | (package |
| 19621 | (name "emacs-move-text") | 19778 | (name "emacs-move-text") |
| 19622 | (version "2.0.8") | 19779 | (version "2.0.10") |
| 19623 | (source | 19780 | (source |
| 19624 | (origin | 19781 | (origin |
| 19625 | (method git-fetch) | 19782 | (method git-fetch) |
| @@ -19628,7 +19785,7 @@ that it can display an error message showing how the parser fails.") | |||
| 19628 | (commit version))) | 19785 | (commit version))) |
| 19629 | (file-name (git-file-name name version)) | 19786 | (file-name (git-file-name name version)) |
| 19630 | (sha256 | 19787 | (sha256 |
| 19631 | (base32 "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1")))) | 19788 | (base32 "0pxvipjp9xvr9zwiwij943jgpy7fk8pxphbdj0vrg8ar5avlqiam")))) |
| 19632 | (build-system emacs-build-system) | 19789 | (build-system emacs-build-system) |
| 19633 | (home-page "https://github.com/emacsfodder/move-text") | 19790 | (home-page "https://github.com/emacsfodder/move-text") |
| 19634 | (synopsis "Move current line or region with M-up or M-down") | 19791 | (synopsis "Move current line or region with M-up or M-down") |
| @@ -21005,7 +21162,7 @@ and doesn't require memorisation of commands. | |||
| 21005 | (define-public emacs-logview | 21162 | (define-public emacs-logview |
| 21006 | (package | 21163 | (package |
| 21007 | (name "emacs-logview") | 21164 | (name "emacs-logview") |
| 21008 | (version "0.15") | 21165 | (version "0.15.1") |
| 21009 | (source | 21166 | (source |
| 21010 | (origin | 21167 | (origin |
| 21011 | (method git-fetch) | 21168 | (method git-fetch) |
| @@ -21014,7 +21171,7 @@ and doesn't require memorisation of commands. | |||
| 21014 | (commit version))) | 21171 | (commit version))) |
| 21015 | (file-name (git-file-name name version)) | 21172 | (file-name (git-file-name name version)) |
| 21016 | (sha256 | 21173 | (sha256 |
| 21017 | (base32 "08bn7fj336krlrsf7flk0fgx9mdkd44vq8sxyx6s1c1q5bc0hqnk")))) | 21174 | (base32 "1khri5632pjirj191x3ps94s4pyrwapf1pbrkmqqp0d26b50d3s2")))) |
| 21018 | (propagated-inputs | 21175 | (propagated-inputs |
| 21019 | (list emacs-datetime emacs-extmap)) | 21176 | (list emacs-datetime emacs-extmap)) |
| 21020 | (build-system emacs-build-system) | 21177 | (build-system emacs-build-system) |
| @@ -30320,14 +30477,14 @@ detected language.") | |||
| 30320 | (define-public emacs-persist | 30477 | (define-public emacs-persist |
| 30321 | (package | 30478 | (package |
| 30322 | (name "emacs-persist") | 30479 | (name "emacs-persist") |
| 30323 | (version "0.4") | 30480 | (version "0.5") |
| 30324 | (source | 30481 | (source |
| 30325 | (origin | 30482 | (origin |
| 30326 | (method url-fetch) | 30483 | (method url-fetch) |
| 30327 | (uri (string-append "https://elpa.gnu.org/packages/" | 30484 | (uri (string-append "https://elpa.gnu.org/packages/" |
| 30328 | "persist-" version ".tar")) | 30485 | "persist-" version ".tar")) |
| 30329 | (sha256 | 30486 | (sha256 |
| 30330 | (base32 "0gpxy41qawzss2526j9a7lys60vqma1lvamn4bfabwza7gfhac0q")))) | 30487 | (base32 "090n4479zs82by7a3vb551gyjvv8lpfcylk43ywr2lfyssc9xiq0")))) |
| 30331 | (build-system emacs-build-system) | 30488 | (build-system emacs-build-system) |
| 30332 | (home-page "http://elpa.gnu.org/packages/persist.html") | 30489 | (home-page "http://elpa.gnu.org/packages/persist.html") |
| 30333 | (synopsis "Persist variables between Emacs sessions") | 30490 | (synopsis "Persist variables between Emacs sessions") |
| @@ -30655,6 +30812,34 @@ conventions.") | |||
| 30655 | snippets for Emacs.") | 30812 | snippets for Emacs.") |
| 30656 | (license license:expat)))) | 30813 | (license license:expat)))) |
| 30657 | 30814 | ||
| 30815 | (define-public emacs-orca | ||
| 30816 | ;; XXX: Upstream did not tag any commit so far. Base version is extracted | ||
| 30817 | ;; from Version keyword. | ||
| 30818 | (let ((commit "0687f416a5573f63b691d384454f5a793266ed97") | ||
| 30819 | (revision "0")) | ||
| 30820 | (package | ||
| 30821 | (name "emacs-orca") | ||
| 30822 | (version (git-version "0.1.0" revision commit)) | ||
| 30823 | (source | ||
| 30824 | (origin | ||
| 30825 | (method git-fetch) | ||
| 30826 | (uri (git-reference | ||
| 30827 | (url "https://github.com/abo-abo/orca") | ||
| 30828 | (commit commit))) | ||
| 30829 | (sha256 | ||
| 30830 | (base32 "00a363vkqvryw5s7pj0kh8pqq5vvbf1pmbzz0b1z1fckwr49sv0f")))) | ||
| 30831 | (build-system emacs-build-system) | ||
| 30832 | (propagated-inputs (list emacs-zoutline)) | ||
| 30833 | (home-page "https://github.com/abo-abo/orca") | ||
| 30834 | (synopsis "Handler for Org Capture") | ||
| 30835 | (description | ||
| 30836 | "This package provides several convenient recipes for configuring Org | ||
| 30837 | Capture, mainly for capturing from a browser. It can match URLs and inject | ||
| 30838 | the capture in a targeted Org file, under a targeted heading. The more this | ||
| 30839 | package is configured, the less refiling is needed on your captures: they will | ||
| 30840 | go directly to where they belong.") | ||
| 30841 | (license license:gpl3+)))) | ||
| 30842 | |||
| 30658 | (define-public emacs-org-roam | 30843 | (define-public emacs-org-roam |
| 30659 | (package | 30844 | (package |
| 30660 | (name "emacs-org-roam") | 30845 | (name "emacs-org-roam") |
| @@ -30717,6 +30902,34 @@ as a plug-and-play solution for anyone already using Org mode for their | |||
| 30717 | personal wiki.") | 30902 | personal wiki.") |
| 30718 | (license license:gpl3+))) | 30903 | (license license:gpl3+))) |
| 30719 | 30904 | ||
| 30905 | (define-public emacs-org-roam-ui | ||
| 30906 | (let ((commit "c75fc7506ee7f03840a9a93ed9336d7ed24551aa") | ||
| 30907 | (revision "0")) | ||
| 30908 | (package | ||
| 30909 | (name "emacs-org-roam-ui") | ||
| 30910 | (version (git-version "0.1" revision commit)) | ||
| 30911 | (source | ||
| 30912 | (origin | ||
| 30913 | (method git-fetch) | ||
| 30914 | (uri (git-reference | ||
| 30915 | (url "https://github.com/org-roam/org-roam-ui") | ||
| 30916 | (commit commit))) | ||
| 30917 | (sha256 | ||
| 30918 | (base32 "0mkcd2622np8s5qz2zvx7lch6dc586xqmn6914gi4ym7nvklf3zy")))) | ||
| 30919 | (build-system emacs-build-system) | ||
| 30920 | (arguments | ||
| 30921 | (list #:include #~(cons "^out" %default-include))) | ||
| 30922 | (propagated-inputs | ||
| 30923 | (list emacs-org-roam emacs-simple-httpd emacs-websocket)) | ||
| 30924 | (home-page "https://github.com/org-roam/org-roam-ui") | ||
| 30925 | (synopsis "Web User Interface for Org Roam") | ||
| 30926 | (description | ||
| 30927 | "Org Roam UI is meant as a successor of Org Roam server that extends | ||
| 30928 | functionality of Org Roam with a web app that runs side-by-side with Emacs, | ||
| 30929 | providing a web interface for navigating around notes created within Org | ||
| 30930 | Roam.") | ||
| 30931 | (license license:gpl3+)))) | ||
| 30932 | |||
| 30720 | (define-public emacs-org-roam-bibtex | 30933 | (define-public emacs-org-roam-bibtex |
| 30721 | (package | 30934 | (package |
| 30722 | (name "emacs-org-roam-bibtex") | 30935 | (name "emacs-org-roam-bibtex") |
| @@ -31575,14 +31788,14 @@ work on alists, hash-table and arrays. All functions are prefixed with | |||
| 31575 | (define-public emacs-xref | 31788 | (define-public emacs-xref |
| 31576 | (package | 31789 | (package |
| 31577 | (name "emacs-xref") | 31790 | (name "emacs-xref") |
| 31578 | (version "1.5.0") | 31791 | (version "1.5.1") |
| 31579 | (source | 31792 | (source |
| 31580 | (origin | 31793 | (origin |
| 31581 | (method url-fetch) | 31794 | (method url-fetch) |
| 31582 | (uri (string-append "https://elpa.gnu.org/packages/xref-" | 31795 | (uri (string-append "https://elpa.gnu.org/packages/xref-" |
| 31583 | version ".tar")) | 31796 | version ".tar")) |
| 31584 | (sha256 | 31797 | (sha256 |
| 31585 | (base32 "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d")))) | 31798 | (base32 "131jxsc1sl8q3r9drhylwyfig9qjjkj3hilv3npidp868pr7xdna")))) |
| 31586 | (build-system emacs-build-system) | 31799 | (build-system emacs-build-system) |
| 31587 | (home-page "http://elpa.gnu.org/packages/xref.html") | 31800 | (home-page "http://elpa.gnu.org/packages/xref.html") |
| 31588 | (synopsis "Cross-referencing commands") | 31801 | (synopsis "Cross-referencing commands") |
| @@ -32155,14 +32368,14 @@ are prefixed with @code{seq-} and work on lists, strings, and vectors.") | |||
| 32155 | (define-public emacs-setup | 32368 | (define-public emacs-setup |
| 32156 | (package | 32369 | (package |
| 32157 | (name "emacs-setup") | 32370 | (name "emacs-setup") |
| 32158 | (version "1.3.0") | 32371 | (version "1.3.1") |
| 32159 | (source | 32372 | (source |
| 32160 | (origin | 32373 | (origin |
| 32161 | (method url-fetch) | 32374 | (method url-fetch) |
| 32162 | (uri (string-append "https://elpa.gnu.org/packages/setup-" | 32375 | (uri (string-append "https://elpa.gnu.org/packages/setup-" |
| 32163 | version ".tar")) | 32376 | version ".tar")) |
| 32164 | (sha256 | 32377 | (sha256 |
| 32165 | (base32 "0r13ry73jm31j8fq7v1sh0k113fr4blfkiz85696bdpah2pnca87")))) | 32378 | (base32 "0n9zjclf4b2sr8c8zd37fs45p25p3856frm419c9hch69hhcsv3a")))) |
| 32166 | (build-system emacs-build-system) | 32379 | (build-system emacs-build-system) |
| 32167 | (home-page "https://git.sr.ht/~pkal/setup") | 32380 | (home-page "https://git.sr.ht/~pkal/setup") |
| 32168 | (synopsis "Helpful configuration macro") | 32381 | (synopsis "Helpful configuration macro") |
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 881109bb770..bbed0175d41 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm | |||
| @@ -409,6 +409,10 @@ languages.") | |||
| 409 | (package | 409 | (package |
| 410 | (inherit emacs-next) | 410 | (inherit emacs-next) |
| 411 | (name "emacs-next-pgtk") | 411 | (name "emacs-next-pgtk") |
| 412 | (source | ||
| 413 | (origin | ||
| 414 | (inherit (package-source emacs-next)) | ||
| 415 | (patches (search-patches "emacs-pgtk-super-key-fix.patch")))) | ||
| 412 | (arguments | 416 | (arguments |
| 413 | (substitute-keyword-arguments (package-arguments emacs-next) | 417 | (substitute-keyword-arguments (package-arguments emacs-next) |
| 414 | ((#:configure-flags flags #~'()) | 418 | ((#:configure-flags flags #~'()) |
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 5a79fcb184d..6ff51260b61 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm | |||
| @@ -447,8 +447,15 @@ converts any cubic curves to quadratic. The most useful function is probably | |||
| 447 | (sha256 | 447 | (sha256 |
| 448 | (base32 "068hm62s1iphyg66w96vgiif6ahpcsaf8fr44rk6jdf71f6fyqd5")))) | 448 | (base32 "068hm62s1iphyg66w96vgiif6ahpcsaf8fr44rk6jdf71f6fyqd5")))) |
| 449 | (build-system python-build-system) | 449 | (build-system python-build-system) |
| 450 | (arguments | ||
| 451 | (list #:phases | ||
| 452 | #~(modify-phases %standard-phases | ||
| 453 | (replace 'check | ||
| 454 | (lambda* (#:key tests? #:allow-other-keys) | ||
| 455 | (when tests? | ||
| 456 | (invoke "pytest" "-vv"))))))) | ||
| 450 | (native-inputs | 457 | (native-inputs |
| 451 | (list python-pytest python-pytest-runner python-setuptools-scm)) | 458 | (list python-pytest python-setuptools-scm)) |
| 452 | (propagated-inputs | 459 | (propagated-inputs |
| 453 | (list python-booleanoperations | 460 | (list python-booleanoperations |
| 454 | python-cffsubr | 461 | python-cffsubr |
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4fdee3dc7ba..8e619d1dba9 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm | |||
| @@ -2366,7 +2366,14 @@ visualization.") | |||
| 2366 | (version-major version) "/SAGA%20-%20" version | 2366 | (version-major version) "/SAGA%20-%20" version |
| 2367 | "/saga-" version ".tar.gz")) | 2367 | "/saga-" version ".tar.gz")) |
| 2368 | (sha256 | 2368 | (sha256 |
| 2369 | (base32 "008izjs6gvj09abxf16ssl1xy0ay3ljq4jswbggp6wiiq459minv")))) | 2369 | (base32 "008izjs6gvj09abxf16ssl1xy0ay3ljq4jswbggp6wiiq459minv")) |
| 2370 | (modules '((guix build utils))) | ||
| 2371 | (snippet | ||
| 2372 | '(substitute* "saga-gis/src/tools/docs/docs_pdf/doc_pdf.cpp" | ||
| 2373 | (("^#include <hpdf\\.h>\n" all) | ||
| 2374 | (string-append all "#include <hpdf_version.h>\n")) | ||
| 2375 | (("\\bHPDF_PROJECTING_SCUARE_END\\b") | ||
| 2376 | "HPDF_PROJECTING_SQUARE_END"))))) | ||
| 2370 | (build-system cmake-build-system) | 2377 | (build-system cmake-build-system) |
| 2371 | (native-inputs | 2378 | (native-inputs |
| 2372 | (list pkg-config swig)) | 2379 | (list pkg-config swig)) |
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 190cc429502..5a2bbe618ac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm | |||
| @@ -2293,6 +2293,7 @@ The gnome-about program helps find which version of GNOME is installed.") | |||
| 2293 | (build-system meson-build-system) | 2293 | (build-system meson-build-system) |
| 2294 | (arguments | 2294 | (arguments |
| 2295 | `(#:configure-flags '("-Dlogind=libelogind") | 2295 | `(#:configure-flags '("-Dlogind=libelogind") |
| 2296 | #:meson ,meson-0.60 | ||
| 2296 | #:phases | 2297 | #:phases |
| 2297 | (modify-phases %standard-phases | 2298 | (modify-phases %standard-phases |
| 2298 | (add-after 'unpack 'skip-gtk-update-icon-cache | 2299 | (add-after 'unpack 'skip-gtk-update-icon-cache |
| @@ -5815,7 +5816,10 @@ services for numerous locations.") | |||
| 5815 | "-Dsystemd=false" | 5816 | "-Dsystemd=false" |
| 5816 | ;; Otherwise, the RUNPATH will lack the final path component. | 5817 | ;; Otherwise, the RUNPATH will lack the final path component. |
| 5817 | (string-append "-Dc_link_args=-Wl,-rpath=" #$output | 5818 | (string-append "-Dc_link_args=-Wl,-rpath=" #$output |
| 5818 | "/lib/gnome-settings-daemon-3.0")) | 5819 | "/lib/gnome-settings-daemon-3.0:" |
| 5820 | ;; Also add NSS because for some reason Meson | ||
| 5821 | ;; > 0.60 does not add it automatically (XXX). | ||
| 5822 | (search-input-directory %build-inputs "lib/nss"))) | ||
| 5819 | #:phases | 5823 | #:phases |
| 5820 | #~(modify-phases %standard-phases | 5824 | #~(modify-phases %standard-phases |
| 5821 | (add-before 'configure 'set-baobab-file-name | 5825 | (add-before 'configure 'set-baobab-file-name |
| @@ -9613,7 +9617,8 @@ can add your own files to the collection.") | |||
| 9613 | "15wmikwk62cdi93gas77nqh4fbhlrxrncyfmcd1gfa34jbn7vnsa")))) | 9617 | "15wmikwk62cdi93gas77nqh4fbhlrxrncyfmcd1gfa34jbn7vnsa")))) |
| 9614 | (build-system meson-build-system) | 9618 | (build-system meson-build-system) |
| 9615 | (arguments | 9619 | (arguments |
| 9616 | '(#:glib-or-gtk? #t | 9620 | `(#:meson ,meson-0.60 |
| 9621 | #:glib-or-gtk? #t | ||
| 9617 | #:phases | 9622 | #:phases |
| 9618 | (modify-phases %standard-phases | 9623 | (modify-phases %standard-phases |
| 9619 | (add-after 'unpack 'skip-gtk-update-icon-cache | 9624 | (add-after 'unpack 'skip-gtk-update-icon-cache |
| @@ -9655,6 +9660,8 @@ beautifying border effects.") | |||
| 9655 | (base32 | 9660 | (base32 |
| 9656 | "1qvrxrk1h8bd75xwasxbvlkqrw6xkavjimvc7sslkw6lvb3z86jp")))) | 9661 | "1qvrxrk1h8bd75xwasxbvlkqrw6xkavjimvc7sslkw6lvb3z86jp")))) |
| 9657 | (build-system meson-build-system) | 9662 | (build-system meson-build-system) |
| 9663 | (arguments | ||
| 9664 | (list #:meson meson-0.60)) | ||
| 9658 | (native-inputs | 9665 | (native-inputs |
| 9659 | `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. | 9666 | `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. |
| 9660 | ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache | 9667 | ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache |
| @@ -12022,6 +12029,7 @@ desktop environment.") | |||
| 12022 | gspell | 12029 | gspell |
| 12023 | gtk | 12030 | gtk |
| 12024 | gjs | 12031 | gjs |
| 12032 | libadwaita | ||
| 12025 | libsecret | 12033 | libsecret |
| 12026 | libsoup | 12034 | libsoup |
| 12027 | telepathy-glib | 12035 | telepathy-glib |
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index aa49f891558..a1cf662e37e 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm | |||
| @@ -476,7 +476,21 @@ the GStreamer multimedia framework.") | |||
| 476 | (arguments | 476 | (arguments |
| 477 | (list #:phases | 477 | (list #:phases |
| 478 | #~(modify-phases %standard-phases | 478 | #~(modify-phases %standard-phases |
| 479 | #$@%common-gstreamer-phases))) | 479 | #$@%common-gstreamer-phases |
| 480 | #$@(if (string-prefix? "i686" (or (%current-target-system) | ||
| 481 | (%current-system))) | ||
| 482 | ;; FIXME: These tests consistently fail in the Guix CI: | ||
| 483 | ;; https://issues.guix.gnu.org/57868 | ||
| 484 | '((add-after 'unpack 'disable-systemclock-test | ||
| 485 | (lambda _ | ||
| 486 | (substitute* "tests/check/gst/gstsystemclock.c" | ||
| 487 | (("tcase_add_test \\(tc_chain, \ | ||
| 488 | test_stress_cleanup_unschedule.*") | ||
| 489 | "") | ||
| 490 | (("tcase_add_test \\(tc_chain, \ | ||
| 491 | test_stress_reschedule.*") | ||
| 492 | ""))))) | ||
| 493 | '())))) | ||
| 480 | (propagated-inputs | 494 | (propagated-inputs |
| 481 | ;; In gstreamer-1.0.pc: | 495 | ;; In gstreamer-1.0.pc: |
| 482 | ;; Requires: glib-2.0, gobject-2.0 | 496 | ;; Requires: glib-2.0, gobject-2.0 |
| @@ -880,7 +894,7 @@ model to base your own plug-in on, here it is.") | |||
| 880 | openjpeg | 894 | openjpeg |
| 881 | ;; openni2 | 895 | ;; openni2 |
| 882 | opensles | 896 | opensles |
| 883 | openssl | 897 | openssl-1.1 |
| 884 | opus | 898 | opus |
| 885 | orc | 899 | orc |
| 886 | pango | 900 | pango |
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index aa8efd97c6e..a8f40c4454a 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm | |||
| @@ -324,14 +324,18 @@ many popular formats.") | |||
| 324 | (snippet | 324 | (snippet |
| 325 | '(begin | 325 | '(begin |
| 326 | (for-each | 326 | (for-each |
| 327 | (lambda (dir) | 327 | (lambda (dir) |
| 328 | (delete-file-recursively | 328 | (delete-file-recursively |
| 329 | (string-append "ThirdParty/" dir "/vtk" dir))) | 329 | (string-append "ThirdParty/" dir "/vtk" dir))) |
| 330 | ;; pugixml depended upon unconditionally | 330 | ;; pugixml depended upon unconditionally |
| 331 | '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" | 331 | '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" |
| 332 | "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "lz4" | 332 | "glew" "hdf5" "jpeg" "jsoncpp" "libharu" "libproj" |
| 333 | "netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib")) | 333 | "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora" |
| 334 | #t)))) | 334 | "tiff" "zlib")) |
| 335 | (substitute* "IO/ExportPDF/vtkPDFContextDevice2D.cxx" | ||
| 336 | (("\\bHPDF_UINT16 (noPen|dash|dot|denseDot|dashDot|dashDotDot)\\b" | ||
| 337 | _ var) | ||
| 338 | (string-append "HPDF_REAL " var))))))) | ||
| 335 | (properties `((release-monitoring-url . "https://vtk.org/download/"))) | 339 | (properties `((release-monitoring-url . "https://vtk.org/download/"))) |
| 336 | (build-system cmake-build-system) | 340 | (build-system cmake-build-system) |
| 337 | (arguments | 341 | (arguments |
| @@ -348,6 +352,7 @@ many popular formats.") | |||
| 348 | "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON" | 352 | "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON" |
| 349 | "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON" | 353 | "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON" |
| 350 | "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON" | 354 | "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON" |
| 355 | "-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=ON" | ||
| 351 | "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON" | 356 | "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON" |
| 352 | "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON" | 357 | "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON" |
| 353 | "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON" | 358 | "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON" |
| @@ -381,6 +386,7 @@ many popular formats.") | |||
| 381 | glew | 386 | glew |
| 382 | glu | 387 | glu |
| 383 | hdf5 | 388 | hdf5 |
| 389 | libharu | ||
| 384 | libjpeg-turbo | 390 | libjpeg-turbo |
| 385 | jsoncpp | 391 | jsoncpp |
| 386 | libtheora | 392 | libtheora |
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 34007406498..81e1fb8f703 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm | |||
| @@ -353,17 +353,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." | |||
| 353 | ;; The current "stable" kernels. That is, the most recently released major | 353 | ;; The current "stable" kernels. That is, the most recently released major |
| 354 | ;; versions that are still supported upstream. | 354 | ;; versions that are still supported upstream. |
| 355 | 355 | ||
| 356 | (define-public linux-libre-5.19-version "5.19.8") | 356 | (define-public linux-libre-5.19-version "5.19.9") |
| 357 | (define-public linux-libre-5.19-gnu-revision "gnu") | 357 | (define-public linux-libre-5.19-gnu-revision "gnu") |
| 358 | (define deblob-scripts-5.19 | 358 | (define deblob-scripts-5.19 |
| 359 | (linux-libre-deblob-scripts | 359 | (linux-libre-deblob-scripts |
| 360 | linux-libre-5.19-version | 360 | linux-libre-5.19-version |
| 361 | linux-libre-5.19-gnu-revision | 361 | linux-libre-5.19-gnu-revision |
| 362 | (base32 "1lk90psz33ldb8aiaws4iayhycl5bmywr6badvzffjpr87s5phxw") | 362 | (base32 "1lk90psz33ldb8aiaws4iayhycl5bmywr6badvzffjpr87s5phxw") |
| 363 | (base32 "1ph67fvg5qvlkh4cynrrmvkngkb0sw6k90b1mwy9466s24khn05i"))) | 363 | (base32 "092myqjixvy1k3ylcj0hfc4whfxapjvxsxm4gk30a3jv5dnh7mly"))) |
| 364 | (define-public linux-libre-5.19-pristine-source | 364 | (define-public linux-libre-5.19-pristine-source |
| 365 | (let ((version linux-libre-5.19-version) | 365 | (let ((version linux-libre-5.19-version) |
| 366 | (hash (base32 "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1"))) | 366 | (hash (base32 "0dvzjbyknzlx4ndz77fsm6v28fj2chxbq1z85fbc3bckcscbbm8a"))) |
| 367 | (make-linux-libre-source version | 367 | (make-linux-libre-source version |
| 368 | (%upstream-linux-source version hash) | 368 | (%upstream-linux-source version hash) |
| 369 | deblob-scripts-5.19))) | 369 | deblob-scripts-5.19))) |
| @@ -372,22 +372,22 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." | |||
| 372 | ;; The "longterm" kernels — the older releases with long-term upstream support. | 372 | ;; The "longterm" kernels — the older releases with long-term upstream support. |
| 373 | ;; Here are the support timelines: | 373 | ;; Here are the support timelines: |
| 374 | ;; <https://www.kernel.org/category/releases.html> | 374 | ;; <https://www.kernel.org/category/releases.html> |
| 375 | (define-public linux-libre-5.15-version "5.15.67") | 375 | (define-public linux-libre-5.15-version "5.15.68") |
| 376 | (define-public linux-libre-5.15-gnu-revision "gnu") | 376 | (define-public linux-libre-5.15-gnu-revision "gnu") |
| 377 | (define deblob-scripts-5.15 | 377 | (define deblob-scripts-5.15 |
| 378 | (linux-libre-deblob-scripts | 378 | (linux-libre-deblob-scripts |
| 379 | linux-libre-5.15-version | 379 | linux-libre-5.15-version |
| 380 | linux-libre-5.15-gnu-revision | 380 | linux-libre-5.15-gnu-revision |
| 381 | (base32 "0vj60bra81fmbx3lz924czbhxs4dmvd4d584g9mcs80b7c4q52kg") | 381 | (base32 "0vj60bra81fmbx3lz924czbhxs4dmvd4d584g9mcs80b7c4q52kg") |
| 382 | (base32 "1r189c704jvizk452zcsm9v3g27ybjcjchjwxazsy3nx0wdwx7si"))) | 382 | (base32 "048r4synfax2ajyzlmp672b68yshxwlfccdah2vz1kh88rqfmgsc"))) |
| 383 | (define-public linux-libre-5.15-pristine-source | 383 | (define-public linux-libre-5.15-pristine-source |
| 384 | (let ((version linux-libre-5.15-version) | 384 | (let ((version linux-libre-5.15-version) |
| 385 | (hash (base32 "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys"))) | 385 | (hash (base32 "0zlb44bwpc0hwfynzz5v5b3lkv4aha7w5737ns1qb8cvbk5v7fqp"))) |
| 386 | (make-linux-libre-source version | 386 | (make-linux-libre-source version |
| 387 | (%upstream-linux-source version hash) | 387 | (%upstream-linux-source version hash) |
| 388 | deblob-scripts-5.15))) | 388 | deblob-scripts-5.15))) |
| 389 | 389 | ||
| 390 | (define-public linux-libre-5.10-version "5.10.142") | 390 | (define-public linux-libre-5.10-version "5.10.143") |
| 391 | (define-public linux-libre-5.10-gnu-revision "gnu1") | 391 | (define-public linux-libre-5.10-gnu-revision "gnu1") |
| 392 | (define deblob-scripts-5.10 | 392 | (define deblob-scripts-5.10 |
| 393 | (linux-libre-deblob-scripts | 393 | (linux-libre-deblob-scripts |
| @@ -397,12 +397,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." | |||
| 397 | (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) | 397 | (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) |
| 398 | (define-public linux-libre-5.10-pristine-source | 398 | (define-public linux-libre-5.10-pristine-source |
| 399 | (let ((version linux-libre-5.10-version) | 399 | (let ((version linux-libre-5.10-version) |
| 400 | (hash (base32 "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz"))) | 400 | (hash (base32 "14af0lsvgh1k0fh283d0nrm1pkrk2kaf2mz0ab59vlvjybg9wb7s"))) |
| 401 | (make-linux-libre-source version | 401 | (make-linux-libre-source version |
| 402 | (%upstream-linux-source version hash) | 402 | (%upstream-linux-source version hash) |
| 403 | deblob-scripts-5.10))) | 403 | deblob-scripts-5.10))) |
| 404 | 404 | ||
| 405 | (define-public linux-libre-5.4-version "5.4.212") | 405 | (define-public linux-libre-5.4-version "5.4.213") |
| 406 | (define-public linux-libre-5.4-gnu-revision "gnu1") | 406 | (define-public linux-libre-5.4-gnu-revision "gnu1") |
| 407 | (define deblob-scripts-5.4 | 407 | (define deblob-scripts-5.4 |
| 408 | (linux-libre-deblob-scripts | 408 | (linux-libre-deblob-scripts |
| @@ -412,12 +412,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." | |||
| 412 | (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) | 412 | (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) |
| 413 | (define-public linux-libre-5.4-pristine-source | 413 | (define-public linux-libre-5.4-pristine-source |
| 414 | (let ((version linux-libre-5.4-version) | 414 | (let ((version linux-libre-5.4-version) |
| 415 | (hash (base32 "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9"))) | 415 | (hash (base32 "1wdssqmac66zqsnq5lx2z8ampa0rd3qswg0gm1sh6n3y8xlf2z76"))) |
| 416 | (make-linux-libre-source version | 416 | (make-linux-libre-source version |
| 417 | (%upstream-linux-source version hash) | 417 | (%upstream-linux-source version hash) |
| 418 | deblob-scripts-5.4))) | 418 | deblob-scripts-5.4))) |
| 419 | 419 | ||
| 420 | (define-public linux-libre-4.19-version "4.19.257") | 420 | (define-public linux-libre-4.19-version "4.19.258") |
| 421 | (define-public linux-libre-4.19-gnu-revision "gnu1") | 421 | (define-public linux-libre-4.19-gnu-revision "gnu1") |
| 422 | (define deblob-scripts-4.19 | 422 | (define deblob-scripts-4.19 |
| 423 | (linux-libre-deblob-scripts | 423 | (linux-libre-deblob-scripts |
| @@ -427,12 +427,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." | |||
| 427 | (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) | 427 | (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) |
| 428 | (define-public linux-libre-4.19-pristine-source | 428 | (define-public linux-libre-4.19-pristine-source |
| 429 | (let ((version linux-libre-4.19-version) | 429 | (let ((version linux-libre-4.19-version) |
| 430 | (hash (base32 "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga"))) | 430 | (hash (base32 "002sw8b272dzkp3vff0x89sbj5p3vrrikqygfdgrsxv7k3w4459x"))) |
| 431 | (make-linux-libre-source version | 431 | (make-linux-libre-source version |
| 432 | (%upstream-linux-source version hash) | 432 | (%upstream-linux-source version hash) |
| 433 | deblob-scripts-4.19))) | 433 | deblob-scripts-4.19))) |
| 434 | 434 | ||
| 435 | (define-public linux-libre-4.14-version "4.14.292") | 435 | (define-public linux-libre-4.14-version "4.14.293") |
| 436 | (define-public linux-libre-4.14-gnu-revision "gnu1") | 436 | (define-public linux-libre-4.14-gnu-revision "gnu1") |
| 437 | (define deblob-scripts-4.14 | 437 | (define deblob-scripts-4.14 |
| 438 | (linux-libre-deblob-scripts | 438 | (linux-libre-deblob-scripts |
| @@ -442,12 +442,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." | |||
| 442 | (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) | 442 | (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) |
| 443 | (define-public linux-libre-4.14-pristine-source | 443 | (define-public linux-libre-4.14-pristine-source |
| 444 | (let ((version linux-libre-4.14-version) | 444 | (let ((version linux-libre-4.14-version) |
| 445 | (hash (base32 "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h"))) | 445 | (hash (base32 "047gl9nqrvpi9jaxlmhfnx848qvnrhf13710ka8fwn3lyv22k342"))) |
| 446 | (make-linux-libre-source version | 446 | (make-linux-libre-source version |
| 447 | (%upstream-linux-source version hash) | 447 | (%upstream-linux-source version hash) |
| 448 | deblob-scripts-4.14))) | 448 | deblob-scripts-4.14))) |
| 449 | 449 | ||
| 450 | (define-public linux-libre-4.9-version "4.9.327") | 450 | (define-public linux-libre-4.9-version "4.9.328") |
| 451 | (define-public linux-libre-4.9-gnu-revision "gnu1") | 451 | (define-public linux-libre-4.9-gnu-revision "gnu1") |
| 452 | (define deblob-scripts-4.9 | 452 | (define deblob-scripts-4.9 |
| 453 | (linux-libre-deblob-scripts | 453 | (linux-libre-deblob-scripts |
| @@ -457,7 +457,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." | |||
| 457 | (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) | 457 | (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) |
| 458 | (define-public linux-libre-4.9-pristine-source | 458 | (define-public linux-libre-4.9-pristine-source |
| 459 | (let ((version linux-libre-4.9-version) | 459 | (let ((version linux-libre-4.9-version) |
| 460 | (hash (base32 "1lh63viynf9f7vl0a52mnal8jack9lbqfsfammwkxi3kafpw30r2"))) | 460 | (hash (base32 "1px2np3k796cjwq1sp9gfxyql6hqyqya82vq9cb5y0canq6fqmg8"))) |
| 461 | (make-linux-libre-source version | 461 | (make-linux-libre-source version |
| 462 | (%upstream-linux-source version hash) | 462 | (%upstream-linux-source version hash) |
| 463 | deblob-scripts-4.9))) | 463 | deblob-scripts-4.9))) |
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 43b4a668905..b5600d4bafd 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm | |||
| @@ -1253,45 +1253,45 @@ of xmpppy.") | |||
| 1253 | "3.9" | 1253 | "3.9" |
| 1254 | "/site-packages")))))) | 1254 | "/site-packages")))))) |
| 1255 | (native-inputs | 1255 | (native-inputs |
| 1256 | `(("gettext" ,gettext-minimal) | 1256 | (list gettext-minimal |
| 1257 | ("glib:bin" ,glib "bin") | 1257 | `(,glib "bin") |
| 1258 | ("gobject-introspection" ,gobject-introspection) | 1258 | gobject-introspection |
| 1259 | ("gtk+:bin" ,gtk+ "bin") | 1259 | `(,gtk+ "bin") |
| 1260 | ("python-distutils-extra" ,python-distutils-extra) | 1260 | python-distutils-extra |
| 1261 | ("python-setuptools" ,python-setuptools) | 1261 | python-setuptools |
| 1262 | ("xorg-server" ,xorg-server-for-tests))) | 1262 | xorg-server-for-tests)) |
| 1263 | (inputs | 1263 | (inputs |
| 1264 | `(("avahi" ,avahi) | 1264 | (list avahi |
| 1265 | ("dbus" ,dbus) | 1265 | dbus |
| 1266 | ("farstream" ,farstream) | 1266 | farstream |
| 1267 | ("geoclue" ,geoclue) | 1267 | geoclue |
| 1268 | ("glib" ,glib) | 1268 | glib |
| 1269 | ("glib-networking" ,glib-networking) | 1269 | glib-networking |
| 1270 | ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) | 1270 | gsettings-desktop-schemas |
| 1271 | ("gsound",gsound) | 1271 | gsound |
| 1272 | ("gspell" ,gspell) | 1272 | gspell |
| 1273 | ("gstreamer" ,gstreamer) | 1273 | gstreamer |
| 1274 | ("gst-plugins-base" ,gst-plugins-base) | 1274 | gst-plugins-base |
| 1275 | ("gtk+" ,gtk+) | 1275 | gtk+ |
| 1276 | ("gtksourceview" ,gtksourceview-4) | 1276 | gtksourceview-4 |
| 1277 | ("gupnp-igd" ,gupnp-igd) | 1277 | gupnp-igd |
| 1278 | ("libappindicator" ,libappindicator) | 1278 | libappindicator |
| 1279 | ("libnice" ,libnice) | 1279 | libnice |
| 1280 | ("libsecret" ,libsecret) | 1280 | libsecret |
| 1281 | ("libsoup" ,libsoup) | 1281 | libsoup |
| 1282 | ("libxss" ,libxscrnsaver) | 1282 | libxscrnsaver |
| 1283 | ("network-manager" ,network-manager) | 1283 | network-manager |
| 1284 | ("python-css-parser" ,python-css-parser) | 1284 | python-css-parser |
| 1285 | ("python-dbus" ,python-dbus) | 1285 | python-dbus |
| 1286 | ("python-gssapi" ,python-gssapi) | 1286 | python-gssapi |
| 1287 | ("python-keyring" ,python-keyring) | 1287 | python-keyring |
| 1288 | ("python-nbxmpp" ,python-nbxmpp) | 1288 | python-nbxmpp |
| 1289 | ("python-packaging" ,python-packaging) | 1289 | python-packaging |
| 1290 | ("python-pillow" ,python-pillow) | 1290 | python-pillow |
| 1291 | ("python-precis-i18n" ,python-precis-i18n) | 1291 | python-precis-i18n |
| 1292 | ("python-pycairo" ,python-pycairo) | 1292 | python-pycairo |
| 1293 | ("python-pygobject" ,python-pygobject) | 1293 | python-pygobject |
| 1294 | ("python-pyopenssl" ,python-pyopenssl))) | 1294 | python-pyopenssl)) |
| 1295 | (propagated-inputs | 1295 | (propagated-inputs |
| 1296 | (list dconf)) | 1296 | (list dconf)) |
| 1297 | (synopsis "Fully-featured XMPP client") | 1297 | (synopsis "Fully-featured XMPP client") |
diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index b942703ff3f..a27c1c6a12e 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm | |||
| @@ -155,7 +155,7 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.") | |||
| 155 | #t)))) | 155 | #t)))) |
| 156 | (native-inputs (list which pkg-config)) | 156 | (native-inputs (list which pkg-config)) |
| 157 | (inputs | 157 | (inputs |
| 158 | `(("openssl" ,openssl) | 158 | `(("openssl" ,openssl-1.1) |
| 159 | ("libevent" ,libevent) | 159 | ("libevent" ,libevent) |
| 160 | ;; Build with POSIX capabilities support on GNU/Linux. This allows 'ntpd' | 160 | ;; Build with POSIX capabilities support on GNU/Linux. This allows 'ntpd' |
| 161 | ;; to run as non-root (when invoked with '-u'.) | 161 | ;; to run as non-root (when invoked with '-u'.) |
diff --git a/gnu/packages/patches/emacs-pgtk-super-key-fix.patch b/gnu/packages/patches/emacs-pgtk-super-key-fix.patch new file mode 100644 index 00000000000..a58c448af90 --- /dev/null +++ b/gnu/packages/patches/emacs-pgtk-super-key-fix.patch | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | From a897516fc5ec380938115ad42023f279d128fc1e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andrew Tropin <andrew@trop.in> | ||
| 3 | Date: Fri, 16 Sep 2022 15:24:19 +0300 | ||
| 4 | Subject: [PATCH] Workaround gtk bug for superkey handling | ||
| 5 | |||
| 6 | https://gitlab.gnome.org/GNOME/gtk/-/issues/4913 | ||
| 7 | https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55362 | ||
| 8 | Patch based on Thomas Jost's suggestion. | ||
| 9 | |||
| 10 | --- | ||
| 11 | src/pgtkterm.c | 9 +++++---- | ||
| 12 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/src/pgtkterm.c b/src/pgtkterm.c | ||
| 15 | index 491ba33882..d5a9970693 100644 | ||
| 16 | --- a/src/pgtkterm.c | ||
| 17 | +++ b/src/pgtkterm.c | ||
| 18 | @@ -5051,7 +5051,7 @@ pgtk_gtk_to_emacs_modifiers (struct pgtk_display_info *dpyinfo, int state) | ||
| 19 | mod |= mod_ctrl; | ||
| 20 | if (state & GDK_META_MASK || state & GDK_MOD1_MASK) | ||
| 21 | mod |= mod_meta; | ||
| 22 | - if (state & GDK_SUPER_MASK) | ||
| 23 | + if (state & GDK_SUPER_MASK || state & GDK_MOD4_MASK) | ||
| 24 | mod |= mod_super; | ||
| 25 | if (state & GDK_HYPER_MASK) | ||
| 26 | mod |= mod_hyper; | ||
| 27 | @@ -5184,7 +5184,7 @@ key_press_event (GtkWidget *widget, GdkEvent *event, gpointer *user_data) | ||
| 28 | /* While super is pressed, the input method will always always | ||
| 29 | resend the key events ignoring super. As a workaround, don't | ||
| 30 | filter key events with super or hyper pressed. */ | ||
| 31 | - if (!(event->key.state & (GDK_SUPER_MASK | GDK_HYPER_MASK))) | ||
| 32 | + if (!(event->key.state & (GDK_SUPER_MASK | GDK_MOD4_MASK | GDK_HYPER_MASK))) | ||
| 33 | { | ||
| 34 | if (pgtk_im_filter_keypress (f, &event->key)) | ||
| 35 | return TRUE; | ||
| 36 | @@ -5199,8 +5199,9 @@ key_press_event (GtkWidget *widget, GdkEvent *event, gpointer *user_data) | ||
| 37 | /* make_lispy_event turns chars into control chars. | ||
| 38 | Don't do it here because XLookupString is too eager. */ | ||
| 39 | state &= ~GDK_CONTROL_MASK; | ||
| 40 | - state &= ~(GDK_META_MASK | ||
| 41 | - | GDK_SUPER_MASK | GDK_HYPER_MASK | GDK_MOD1_MASK); | ||
| 42 | + state &= ~(GDK_META_MASK | GDK_MOD1_MASK | ||
| 43 | + | GDK_SUPER_MASK | GDK_MOD4_MASK | ||
| 44 | + | GDK_HYPER_MASK); | ||
| 45 | |||
| 46 | nbytes = event->key.length; | ||
| 47 | if (nbytes > copy_bufsiz) | ||
| 48 | -- | ||
| 49 | 2.37.3 | ||
diff --git a/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch b/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch new file mode 100644 index 00000000000..77a8452c2a4 --- /dev/null +++ b/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From 8b83fa772a71efc9dc030c43db2cba944e4338c1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Kien Nguyen <kien.n.quang@gmail.com> | ||
| 3 | Date: Wed, 19 May 2021 23:15:01 +0900 | ||
| 4 | Subject: [PATCH] Fix using of temporary lexical variable causes error in | ||
| 5 | native compiling | ||
| 6 | |||
| 7 | --- | ||
| 8 | polymode-core.el | 6 +++--- | ||
| 9 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/polymode-core.el b/polymode-core.el | ||
| 12 | index e7d40be..ef316f8 100644 | ||
| 13 | --- a/polymode-core.el | ||
| 14 | +++ b/polymode-core.el | ||
| 15 | @@ -2088,14 +2088,14 @@ Elements of LIST can be either strings or symbols." | ||
| 16 | (stringp pm--output-file) | ||
| 17 | (pm--file-mod-time pm--output-file))) | ||
| 18 | (imt (and omt (pm--file-mod-time pm--input-file))) | ||
| 19 | - (action (if is-exporter "exporting" "weaving")) | ||
| 20 | (ofile (if (and imt (time-less-p imt omt)) | ||
| 21 | (progn | ||
| 22 | (message "Not re-%s as input file '%s' hasn't changed" | ||
| 23 | - (file-name-nondirectory ifile) action) | ||
| 24 | + (if is-exporter "exporting" "weaving") | ||
| 25 | + (file-name-nondirectory ifile)) | ||
| 26 | pm--output-file) | ||
| 27 | (message "%s '%s' with '%s' ..." | ||
| 28 | - (capitalize action) | ||
| 29 | + (if is-exporter "EXPORTING" "WEAVING") | ||
| 30 | (file-name-nondirectory ifile) | ||
| 31 | (eieio-object-name processor)) | ||
| 32 | (let ((fn (with-no-warnings | ||
| 33 | |||
| 34 | base-commit: 44265e35161d77f6eaa09388ea2256b89bd5dcc8 | ||
| 35 | -- | ||
| 36 | 2.37.2 | ||
| 37 | |||
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c18e7f7f621..bdc773f650c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> | 22 | ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> |
| 23 | ;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> | 23 | ;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> |
| 24 | ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> | 24 | ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> |
| 25 | ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com> | ||
| 25 | ;;; | 26 | ;;; |
| 26 | ;;; This file is part of GNU Guix. | 27 | ;;; This file is part of GNU Guix. |
| 27 | ;;; | 28 | ;;; |
| @@ -385,36 +386,37 @@ Poppler PDF rendering library.") | |||
| 385 | 386 | ||
| 386 | (define-public libharu | 387 | (define-public libharu |
| 387 | (package | 388 | (package |
| 388 | (name "libharu") | 389 | (name "libharu") |
| 389 | (version "2.3.0") | 390 | (version "2.4.2") |
| 390 | (source (origin | 391 | (source |
| 391 | (method git-fetch) | 392 | (origin |
| 392 | (uri (git-reference | 393 | (method git-fetch) |
| 393 | (url "https://github.com/libharu/libharu") | 394 | (uri (git-reference |
| 394 | (commit (string-append | 395 | (url "https://github.com/libharu/libharu") |
| 395 | "RELEASE_" | 396 | (commit (string-append "v" version)))) |
| 396 | (string-join (string-split version #\.) "_"))))) | 397 | (file-name (git-file-name name version)) |
| 397 | (file-name (git-file-name name version)) | 398 | (sha256 |
| 398 | (sha256 | 399 | (base32 "1jwzqvv81zf5f7zssyixhyjirlp9ddwkbaabd177syb1bxljlsdc")))) |
| 399 | (base32 | 400 | (build-system cmake-build-system) |
| 400 | "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q")))) | 401 | (arguments |
| 401 | (build-system gnu-build-system) | 402 | (list #:tests? #f ; No tests |
| 402 | (arguments | 403 | #:phases |
| 403 | `(#:configure-flags | 404 | #~(modify-phases %standard-phases |
| 404 | (list (string-append "--with-zlib=" | 405 | (add-after 'unpack 'patch-cmake |
| 405 | (assoc-ref %build-inputs "zlib")) | 406 | (lambda _ |
| 406 | (string-append "--with-png=" | 407 | (substitute* "CMakeLists.txt" |
| 407 | (assoc-ref %build-inputs "libpng"))))) | 408 | (("^install\\(FILES (README\\.md CHANGES) INSTALL DESTINATION .*\\)" |
| 408 | (inputs | 409 | _ files) |
| 409 | (list zlib libpng)) | 410 | (format #f "install(FILES ~a DESTINATION ~a/share/doc/~a-~a)" |
| 410 | (native-inputs | 411 | files #$output #$name #$version)))))))) |
| 411 | (list autoconf automake libtool)) | 412 | (inputs |
| 412 | (home-page "http://libharu.org/") | 413 | (list libpng zlib)) |
| 413 | (synopsis "Library for generating PDF files") | 414 | (home-page "http://libharu.org/") |
| 414 | (description | 415 | (synopsis "Library for generating PDF files") |
| 415 | "libHaru is a library for generating PDF files. libHaru does not support | 416 | (description |
| 417 | "libHaru is a library for generating PDF files. libHaru does not support | ||
| 416 | reading and editing of existing PDF files.") | 418 | reading and editing of existing PDF files.") |
| 417 | (license license:zlib))) | 419 | (license license:zlib))) |
| 418 | 420 | ||
| 419 | (define-public xpdf | 421 | (define-public xpdf |
| 420 | (package | 422 | (package |
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index fdea27160df..645a8edee1d 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm | |||
| @@ -381,7 +381,7 @@ | |||
| 381 | ("libzip" ,libzip) | 381 | ("libzip" ,libzip) |
| 382 | ("oniguruma" ,oniguruma) | 382 | ("oniguruma" ,oniguruma) |
| 383 | ("openldap" ,openldap) | 383 | ("openldap" ,openldap) |
| 384 | ("openssl" ,openssl) | 384 | ("openssl" ,openssl-1.1) |
| 385 | ("pcre" ,pcre2) | 385 | ("pcre" ,pcre2) |
| 386 | ("postgresql" ,postgresql) | 386 | ("postgresql" ,postgresql) |
| 387 | ("readline" ,readline) | 387 | ("readline" ,readline) |
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 4dcf4802a2b..6afbf57c776 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm | |||
| @@ -269,14 +269,14 @@ colors, styles, options and details.") | |||
| 269 | (define-public asymptote | 269 | (define-public asymptote |
| 270 | (package | 270 | (package |
| 271 | (name "asymptote") | 271 | (name "asymptote") |
| 272 | (version "2.82") | 272 | (version "2.83") |
| 273 | (source | 273 | (source |
| 274 | (origin | 274 | (origin |
| 275 | (method url-fetch) | 275 | (method url-fetch) |
| 276 | (uri (string-append "mirror://sourceforge/asymptote/" | 276 | (uri (string-append "mirror://sourceforge/asymptote/" |
| 277 | version "/asymptote-" version ".src.tgz")) | 277 | version "/asymptote-" version ".src.tgz")) |
| 278 | (sha256 | 278 | (sha256 |
| 279 | (base32 "13blmsapbai4hqynyj1r1sjpypdv6frfassl2f2x7j2ql1dbqvsg")) | 279 | (base32 "18w8nf0p1b3h74sk1b7w96kq5gcaq09idi4771ini7p594gsfg7y")) |
| 280 | (modules '((guix build utils))) | 280 | (modules '((guix build utils))) |
| 281 | (snippet | 281 | (snippet |
| 282 | ;; Remove bundled RapidJSON. | 282 | ;; Remove bundled RapidJSON. |
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index d1698e5f677..80acb606b26 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm | |||
| @@ -348,13 +348,13 @@ library.") | |||
| 348 | (define-public python-pandas | 348 | (define-public python-pandas |
| 349 | (package | 349 | (package |
| 350 | (name "python-pandas") | 350 | (name "python-pandas") |
| 351 | (version "1.4.2") | 351 | (version "1.4.4") |
| 352 | (source | 352 | (source |
| 353 | (origin | 353 | (origin |
| 354 | (method url-fetch) | 354 | (method url-fetch) |
| 355 | (uri (pypi-uri "pandas" version)) | 355 | (uri (pypi-uri "pandas" version)) |
| 356 | (sha256 | 356 | (sha256 |
| 357 | (base32 "04lsak3j5hq2hk0vfjf532rdxdqmg2akamdl4yl3qipihp2izg4j")))) | 357 | (base32 "0ryv66s9cvd27q6a985vv556k2qlnlrdna2z7qc7bdhphrrhsv5b")))) |
| 358 | (build-system python-build-system) | 358 | (build-system python-build-system) |
| 359 | (arguments | 359 | (arguments |
| 360 | `(#:modules ((guix build utils) | 360 | `(#:modules ((guix build utils) |
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 9b3eb12613b..1b087635d1f 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm | |||
| @@ -117,6 +117,9 @@ | |||
| 117 | elogind-service | 117 | elogind-service |
| 118 | elogind-service-type | 118 | elogind-service-type |
| 119 | 119 | ||
| 120 | %gdm-file-system | ||
| 121 | gdm-file-system-service | ||
| 122 | |||
| 120 | %fontconfig-file-system | 123 | %fontconfig-file-system |
| 121 | fontconfig-file-system-service | 124 | fontconfig-file-system-service |
| 122 | 125 | ||
| @@ -1232,6 +1235,13 @@ when they log out." | |||
| 1232 | (flags '(read-only)) | 1235 | (flags '(read-only)) |
| 1233 | (check? #f))) | 1236 | (check? #f))) |
| 1234 | 1237 | ||
| 1238 | (define %gdm-file-system | ||
| 1239 | (file-system | ||
| 1240 | (device "none") | ||
| 1241 | (mount-point "/var/lib/gdm") | ||
| 1242 | (type "tmpfs") | ||
| 1243 | (check? #f))) | ||
| 1244 | |||
| 1235 | ;; The global fontconfig cache directory can sometimes contain stale entries, | 1245 | ;; The global fontconfig cache directory can sometimes contain stale entries, |
| 1236 | ;; possibly referencing fonts that have been GC'd, so mount it read-only. | 1246 | ;; possibly referencing fonts that have been GC'd, so mount it read-only. |
| 1237 | ;; As mentioned https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36924#8 and | 1247 | ;; As mentioned https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36924#8 and |
| @@ -1240,6 +1250,15 @@ when they log out." | |||
| 1240 | (simple-service 'fontconfig-file-system | 1250 | (simple-service 'fontconfig-file-system |
| 1241 | file-system-service-type | 1251 | file-system-service-type |
| 1242 | (list %fontconfig-file-system))) | 1252 | (list %fontconfig-file-system))) |
| 1253 | |||
| 1254 | ;; Avoid stale caches and stale user IDs being reused between system | ||
| 1255 | ;; reconfigurations, which would crash GDM and render the system unusable. | ||
| 1256 | ;; GDM doesn't require persisting anything valuable there anyway. | ||
| 1257 | (define gdm-file-system-service | ||
| 1258 | (simple-service 'gdm-file-system | ||
| 1259 | file-system-service-type | ||
| 1260 | (list %gdm-file-system))) | ||
| 1261 | |||
| 1243 | 1262 | ||
| 1244 | ;;; | 1263 | ;;; |
| 1245 | ;;; AccountsService service. | 1264 | ;;; AccountsService service. |
| @@ -1750,6 +1769,10 @@ applications needing access to be root.") | |||
| 1750 | (list (file-append nfs-utils "/sbin/mount.nfs") | 1769 | (list (file-append nfs-utils "/sbin/mount.nfs") |
| 1751 | (file-append ntfs-3g "/sbin/mount.ntfs-3g")))) | 1770 | (file-append ntfs-3g "/sbin/mount.ntfs-3g")))) |
| 1752 | 1771 | ||
| 1772 | ;; This is a volatile read-write file system mounted at /var/lib/gdm, | ||
| 1773 | ;; to avoid GDM stale cache and permission issues. | ||
| 1774 | gdm-file-system-service | ||
| 1775 | |||
| 1753 | ;; The global fontconfig cache directory can sometimes contain | 1776 | ;; The global fontconfig cache directory can sometimes contain |
| 1754 | ;; stale entries, possibly referencing fonts that have been GC'd, | 1777 | ;; stale entries, possibly referencing fonts that have been GC'd, |
| 1755 | ;; so mount it read-only. | 1778 | ;; so mount it read-only. |
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 0cbd9aa53bb..3ff290c1971 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm | |||
| @@ -818,27 +818,6 @@ the GNOME desktop environment.") | |||
| 818 | (home-directory "/var/lib/gdm") | 818 | (home-directory "/var/lib/gdm") |
| 819 | (shell (file-append shadow "/sbin/nologin"))))) | 819 | (shell (file-append shadow "/sbin/nologin"))))) |
| 820 | 820 | ||
| 821 | (define %gdm-activation | ||
| 822 | ;; Ensure /var/lib/gdm is owned by the "gdm" user. This is normally the | ||
| 823 | ;; case but could be wrong if the "gdm" user was created, then removed, and | ||
| 824 | ;; then recreated under a different UID/GID: <https://bugs.gnu.org/37423>. | ||
| 825 | (with-imported-modules '((guix build utils)) | ||
| 826 | #~(begin | ||
| 827 | (use-modules (guix build utils)) | ||
| 828 | |||
| 829 | (let* ((gdm (getpwnam "gdm")) | ||
| 830 | (uid (passwd:uid gdm)) | ||
| 831 | (gid (passwd:gid gdm)) | ||
| 832 | (st (stat "/var/lib/gdm" #f))) | ||
| 833 | ;; Recurse into /var/lib/gdm only if it has wrong ownership. | ||
| 834 | (when (and st | ||
| 835 | (or (not (= uid (stat:uid st))) | ||
| 836 | (not (= gid (stat:gid st))))) | ||
| 837 | (for-each (lambda (file) | ||
| 838 | (chown file uid gid)) | ||
| 839 | (find-files "/var/lib/gdm" | ||
| 840 | #:directories? #t))))))) | ||
| 841 | |||
| 842 | (define dbus-daemon-wrapper | 821 | (define dbus-daemon-wrapper |
| 843 | (program-file | 822 | (program-file |
| 844 | "gdm-dbus-wrapper" | 823 | "gdm-dbus-wrapper" |
| @@ -1022,8 +1001,6 @@ the GNOME desktop environment.") | |||
| 1022 | (extensions | 1001 | (extensions |
| 1023 | (list (service-extension shepherd-root-service-type | 1002 | (list (service-extension shepherd-root-service-type |
| 1024 | gdm-shepherd-service) | 1003 | gdm-shepherd-service) |
| 1025 | (service-extension activation-service-type | ||
| 1026 | (const %gdm-activation)) | ||
| 1027 | (service-extension account-service-type | 1004 | (service-extension account-service-type |
| 1028 | (const %gdm-accounts)) | 1005 | (const %gdm-accounts)) |
| 1029 | (service-extension pam-root-service-type | 1006 | (service-extension pam-root-service-type |
