From 77e768ac4e57d5fd443c7d69a7cc0c8339d0c238 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Fri, 16 Sep 2022 15:53:53 +0300 Subject: gnu: emacs-next-pgtk: Fix super key problem. Recent version of emacs 29 with pgtk flag has a problem with handling super key modifier, due to gtk bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4913 This commit workarounds it. * gnu/packages/patches/emacs-pgtk-super-key-fix.patch: New file. * gnu/packages/emacs.scm (emacs-next-pgtk): Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 4 ++ .../patches/emacs-pgtk-super-key-fix.patch | 49 ++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 gnu/packages/patches/emacs-pgtk-super-key-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index ebfc7fd803..de460c2017 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1052,6 +1052,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ %D%/packages/patches/emacs-yasnippet-fix-tests.patch \ %D%/packages/patches/emacs-kv-fix-tests.patch \ + %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ef6e9ae1f1..fc93852880 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -409,6 +409,10 @@ (define-public emacs-next-pgtk (package (inherit emacs-next) (name "emacs-next-pgtk") + (source + (origin + (inherit (package-source emacs-next)) + (patches (search-patches "emacs-pgtk-super-key-fix.patch")))) (arguments (substitute-keyword-arguments (package-arguments emacs-next) ((#:configure-flags flags #~'()) 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 0000000000..a58c448af9 --- /dev/null +++ b/gnu/packages/patches/emacs-pgtk-super-key-fix.patch @@ -0,0 +1,49 @@ +From a897516fc5ec380938115ad42023f279d128fc1e Mon Sep 17 00:00:00 2001 +From: Andrew Tropin +Date: Fri, 16 Sep 2022 15:24:19 +0300 +Subject: [PATCH] Workaround gtk bug for superkey handling + +https://gitlab.gnome.org/GNOME/gtk/-/issues/4913 +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55362 +Patch based on Thomas Jost's suggestion. + +--- + src/pgtkterm.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/pgtkterm.c b/src/pgtkterm.c +index 491ba33882..d5a9970693 100644 +--- a/src/pgtkterm.c ++++ b/src/pgtkterm.c +@@ -5051,7 +5051,7 @@ pgtk_gtk_to_emacs_modifiers (struct pgtk_display_info *dpyinfo, int state) + mod |= mod_ctrl; + if (state & GDK_META_MASK || state & GDK_MOD1_MASK) + mod |= mod_meta; +- if (state & GDK_SUPER_MASK) ++ if (state & GDK_SUPER_MASK || state & GDK_MOD4_MASK) + mod |= mod_super; + if (state & GDK_HYPER_MASK) + mod |= mod_hyper; +@@ -5184,7 +5184,7 @@ key_press_event (GtkWidget *widget, GdkEvent *event, gpointer *user_data) + /* While super is pressed, the input method will always always + resend the key events ignoring super. As a workaround, don't + filter key events with super or hyper pressed. */ +- if (!(event->key.state & (GDK_SUPER_MASK | GDK_HYPER_MASK))) ++ if (!(event->key.state & (GDK_SUPER_MASK | GDK_MOD4_MASK | GDK_HYPER_MASK))) + { + if (pgtk_im_filter_keypress (f, &event->key)) + return TRUE; +@@ -5199,8 +5199,9 @@ key_press_event (GtkWidget *widget, GdkEvent *event, gpointer *user_data) + /* make_lispy_event turns chars into control chars. + Don't do it here because XLookupString is too eager. */ + state &= ~GDK_CONTROL_MASK; +- state &= ~(GDK_META_MASK +- | GDK_SUPER_MASK | GDK_HYPER_MASK | GDK_MOD1_MASK); ++ state &= ~(GDK_META_MASK | GDK_MOD1_MASK ++ | GDK_SUPER_MASK | GDK_MOD4_MASK ++ | GDK_HYPER_MASK); + + nbytes = event->key.length; + if (nbytes > copy_bufsiz) +-- +2.37.3 -- cgit v1.2.3 From 9286e34009b8cfb90a11959fec01c1abfb16cbff Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 16 Sep 2022 13:04:07 +0200 Subject: gnu: emacs-ement: Update to 0.1.4. * gnu/packages/emacs-xyz.scm (emacs-ement): Update to 0.1.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5aff012adb..6d8d945580 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16574,7 +16574,7 @@ (define-public emacs-plz (define-public emacs-ement (package (name "emacs-ement") - (version "0.1.3") + (version "0.1.4") (source (origin (method git-fetch) @@ -16583,7 +16583,7 @@ (define-public emacs-ement (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "075mwlc616rr86zgli36n6r8w09c5cvlk43by0f1xzla5rmiza8r")))) + (base32 "1kms6l14h6ig8kphzpkxv16z7gpvcwvcfsp5ljssdnrx0c7dzz16")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs)) ;need libxml support -- cgit v1.2.3 From abdc2e15ba3523e655bdf662193696da1c733e86 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 16 Sep 2022 13:08:47 +0200 Subject: gnu: emacs-move-text: Update to 2.0.10. * gnu/packages/emacs-xyz.scm (emacs-move-text): Update to 2.0.10. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6d8d945580..a77ed1e01c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19619,7 +19619,7 @@ (define-public emacs-parsec (define-public emacs-move-text (package (name "emacs-move-text") - (version "2.0.8") + (version "2.0.10") (source (origin (method git-fetch) @@ -19628,7 +19628,7 @@ (define-public emacs-move-text (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1")))) + (base32 "0pxvipjp9xvr9zwiwij943jgpy7fk8pxphbdj0vrg8ar5avlqiam")))) (build-system emacs-build-system) (home-page "https://github.com/emacsfodder/move-text") (synopsis "Move current line or region with M-up or M-down") -- cgit v1.2.3 From eaad411a7b40148d2283db8104334bb0bbeedc23 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 16 Sep 2022 13:12:33 +0200 Subject: gnu: emacs-subed: Update to 1.0.9. * gnu/packages/emacs-xyz.scm (emacs-subed): Update to 1.0.9. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a77ed1e01c..f78c10a0b6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6725,14 +6725,14 @@ (define-public emacs-sudo-edit (define-public emacs-subed (package (name "emacs-subed") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) (uri (string-append "https://elpa.nongnu.org/nongnu/subed-" version ".tar")) (sha256 (base32 - "05dx4ywma7n73d0cihf4v8ayihm7gmfqpzvdycq4yk0zkxb958z1")))) + "192m7pg8hiqx7ppr1sk6n5qjcbz78dmcg6m14syq12ll07zfpcm0")))) (arguments (list #:tests? #t -- cgit v1.2.3 From 5dec2059c8661d727b25590fd90670ae5b84dde9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 16 Sep 2022 13:12:39 +0200 Subject: gnu: emacs-persist: Update to 0.5. * gnu/packages/emacs-xyz.scm (emacs-persist): Update to 0.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f78c10a0b6..6ff5c0d72d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -30320,14 +30320,14 @@ (define-public emacs-auto-dictionary-mode (define-public emacs-persist (package (name "emacs-persist") - (version "0.4") + (version "0.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "persist-" version ".tar")) (sha256 - (base32 "0gpxy41qawzss2526j9a7lys60vqma1lvamn4bfabwza7gfhac0q")))) + (base32 "090n4479zs82by7a3vb551gyjvv8lpfcylk43ywr2lfyssc9xiq0")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/persist.html") (synopsis "Persist variables between Emacs sessions") -- cgit v1.2.3 From 3e2760cfcaa3d27081bb05c10a3b8f034b2bc94a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 16 Sep 2022 13:12:47 +0200 Subject: gnu: emacs-xref: Update to 1.5.1. * gnu/packages/emacs-xyz.scm (emacs-xref): Update to 1.5.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6ff5c0d72d..3e2bdd36bc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31575,14 +31575,14 @@ (define-public emacs-map (define-public emacs-xref (package (name "emacs-xref") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xref-" version ".tar")) (sha256 - (base32 "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d")))) + (base32 "131jxsc1sl8q3r9drhylwyfig9qjjkj3hilv3npidp868pr7xdna")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/xref.html") (synopsis "Cross-referencing commands") -- cgit v1.2.3 From 4ce19aa086a17efa8db78237b25f2aaee124ef92 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 16 Sep 2022 13:12:53 +0200 Subject: gnu: emacs-setup: Update to 1.3.1. * gnu/packages/emacs-xyz.scm (emacs-setup): Update to 1.3.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3e2bdd36bc..71b1fc5818 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -32155,14 +32155,14 @@ (define-public emacs-seq (define-public emacs-setup (package (name "emacs-setup") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/setup-" version ".tar")) (sha256 - (base32 "0r13ry73jm31j8fq7v1sh0k113fr4blfkiz85696bdpah2pnca87")))) + (base32 "0n9zjclf4b2sr8c8zd37fs45p25p3856frm419c9hch69hhcsv3a")))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~pkal/setup") (synopsis "Helpful configuration macro") -- cgit v1.2.3 From e8fac28b9b1fee6c4327cc93eabf630ddae99b59 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 16 Sep 2022 13:15:10 +0200 Subject: gnu: emacs-transpose-frame: Update to 0.2.1. * gnu/packages/emacs-xyz.scm (emacs-transpose-frame): Update to 0.2.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 71b1fc5818..d99df6cc69 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15755,7 +15755,7 @@ (define-public emacs-gnuplot (define-public emacs-transpose-frame (package (name "emacs-transpose-frame") - (version "0.2.0") + (version "0.2.1") (source (origin (method git-fetch) @@ -15764,7 +15764,7 @@ (define-public emacs-transpose-frame (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01j4ci0c52r2c31hc9r4p7nsb6s8blmvg50g9n5v5h3afjl1c35v")))) + (base32 "0m9jmfwwhgkwxbq3y000ymx7parbgqr7gq3yjm2wh1ll747gv51y")))) (build-system emacs-build-system) (home-page "https://www.emacswiki.org/emacs/TransposeFrame") (synopsis "Transpose window arrangement in current frame") -- cgit v1.2.3 From d7e56aebec4535f3567c362b6084818873e54b0d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 16 Sep 2022 14:45:15 -0400 Subject: services: desktop: Mount /var/lib/gdm on a tmpfs file system. Fixes . * gnu/services/xorg.scm (%gdm-activation): Delete variable. (gdm-service-type): De-register it. * gnu/services/desktop.scm (%gdm-file-system): New variable. (gdm-file-system-service): Likewise. (desktop-services-for-system): Use it. --- gnu/services/desktop.scm | 23 +++++++++++++++++++++++ gnu/services/xorg.scm | 23 ----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 9b3eb12613..1b087635d1 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -117,6 +117,9 @@ (define-module (gnu services desktop) elogind-service elogind-service-type + %gdm-file-system + gdm-file-system-service + %fontconfig-file-system fontconfig-file-system-service @@ -1232,6 +1235,13 @@ (define %fontconfig-file-system (flags '(read-only)) (check? #f))) +(define %gdm-file-system + (file-system + (device "none") + (mount-point "/var/lib/gdm") + (type "tmpfs") + (check? #f))) + ;; The global fontconfig cache directory can sometimes contain stale entries, ;; possibly referencing fonts that have been GC'd, so mount it read-only. ;; As mentioned https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36924#8 and @@ -1240,6 +1250,15 @@ (define fontconfig-file-system-service (simple-service 'fontconfig-file-system file-system-service-type (list %fontconfig-file-system))) + +;; Avoid stale caches and stale user IDs being reused between system +;; reconfigurations, which would crash GDM and render the system unusable. +;; GDM doesn't require persisting anything valuable there anyway. +(define gdm-file-system-service + (simple-service 'gdm-file-system + file-system-service-type + (list %gdm-file-system))) + ;;; ;;; AccountsService service. @@ -1750,6 +1769,10 @@ (define* (desktop-services-for-system #:optional (list (file-append nfs-utils "/sbin/mount.nfs") (file-append ntfs-3g "/sbin/mount.ntfs-3g")))) + ;; This is a volatile read-write file system mounted at /var/lib/gdm, + ;; to avoid GDM stale cache and permission issues. + gdm-file-system-service + ;; The global fontconfig cache directory can sometimes contain ;; stale entries, possibly referencing fonts that have been GC'd, ;; so mount it read-only. diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 0cbd9aa53b..3ff290c197 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -818,27 +818,6 @@ (define %gdm-accounts (home-directory "/var/lib/gdm") (shell (file-append shadow "/sbin/nologin"))))) -(define %gdm-activation - ;; Ensure /var/lib/gdm is owned by the "gdm" user. This is normally the - ;; case but could be wrong if the "gdm" user was created, then removed, and - ;; then recreated under a different UID/GID: . - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - - (let* ((gdm (getpwnam "gdm")) - (uid (passwd:uid gdm)) - (gid (passwd:gid gdm)) - (st (stat "/var/lib/gdm" #f))) - ;; Recurse into /var/lib/gdm only if it has wrong ownership. - (when (and st - (or (not (= uid (stat:uid st))) - (not (= gid (stat:gid st))))) - (for-each (lambda (file) - (chown file uid gid)) - (find-files "/var/lib/gdm" - #:directories? #t))))))) - (define dbus-daemon-wrapper (program-file "gdm-dbus-wrapper" @@ -1022,8 +1001,6 @@ (define gdm-service-type (extensions (list (service-extension shepherd-root-service-type gdm-shepherd-service) - (service-extension activation-service-type - (const %gdm-activation)) (service-extension account-service-type (const %gdm-accounts)) (service-extension pam-root-service-type -- cgit v1.2.3 From f2327f0b2e9bccae5991556b4d253fce857fd870 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 17 Sep 2022 11:19:02 -0400 Subject: gnu: gajim: Remove inputs labels. * gnu/packages/messaging.scm (gajim): Remove input labels. --- gnu/packages/messaging.scm | 76 +++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f0814bf28a..d4e15d666d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1253,45 +1253,45 @@ (define-public gajim "3.9" "/site-packages")))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("python-distutils-extra" ,python-distutils-extra) - ("python-setuptools" ,python-setuptools) - ("xorg-server" ,xorg-server-for-tests))) + (list gettext-minimal + `(,glib "bin") + gobject-introspection + `(,gtk+ "bin") + python-distutils-extra + python-setuptools + xorg-server-for-tests)) (inputs - `(("avahi" ,avahi) - ("dbus" ,dbus) - ("farstream" ,farstream) - ("geoclue" ,geoclue) - ("glib" ,glib) - ("glib-networking" ,glib-networking) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gsound",gsound) - ("gspell" ,gspell) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview) - ("gupnp-igd" ,gupnp-igd) - ("libappindicator" ,libappindicator) - ("libnice" ,libnice) - ("libsecret" ,libsecret) - ("libsoup" ,libsoup) - ("libxss" ,libxscrnsaver) - ("network-manager" ,network-manager) - ("python-css-parser" ,python-css-parser) - ("python-dbus" ,python-dbus) - ("python-gssapi" ,python-gssapi) - ("python-keyring" ,python-keyring) - ("python-nbxmpp" ,python-nbxmpp) - ("python-packaging" ,python-packaging) - ("python-pillow" ,python-pillow) - ("python-precis-i18n" ,python-precis-i18n) - ("python-pycairo" ,python-pycairo) - ("python-pygobject" ,python-pygobject) - ("python-pyopenssl" ,python-pyopenssl))) + (list avahi + dbus + farstream + geoclue + glib + glib-networking + gsettings-desktop-schemas + gsound + gspell + gstreamer + gst-plugins-base + gtk+ + gtksourceview + gupnp-igd + libappindicator + libnice + libsecret + libsoup + libxscrnsaver + network-manager + python-css-parser + python-dbus + python-gssapi + python-keyring + python-nbxmpp + python-packaging + python-pillow + python-precis-i18n + python-pycairo + python-pygobject + python-pyopenssl)) (propagated-inputs (list dconf)) (synopsis "Fully-featured XMPP client") -- cgit v1.2.3 From c54ef97c80f98fba77304efc560945fe78a4bafb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 17 Sep 2022 11:22:41 -0400 Subject: gnu: gajim: Fix gtksourceview dependency. * gnu/packages/messaging.scm (gajim)[inputs]: Use gtksourceview-4. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d4e15d666d..b5600d4baf 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1273,7 +1273,7 @@ (define-public gajim gstreamer gst-plugins-base gtk+ - gtksourceview + gtksourceview-4 gupnp-igd libappindicator libnice -- cgit v1.2.3 From 5d22261db3d5099d745b9e8c8484545e546b319e Mon Sep 17 00:00:00 2001 From: Taiju HIGASHI Date: Fri, 9 Sep 2022 22:47:36 +0900 Subject: import: gem: Support importing a specific version of a gem. * guix/import/gem.scm: (rubygems-fetch, gem->guix-package) (gem-recursive-import): Fix to fetch the specified version of the gem. * guix/scripts/import/gem.scm (show-help): Update the help message. (guix-import-gem): Modify so the version number to be passed to subsequent procedures. * tests/gem.scm: Add tests. * doc/guix.texi (Invoking guix import): Document. Signed-off-by: Christopher Baines --- doc/guix.texi | 6 +++ guix/import/gem.scm | 19 +++++--- guix/scripts/import/gem.scm | 39 ++++++++------- tests/gem.scm | 113 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 23 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index c5d2c2d5d8..eb12efa85e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13219,6 +13219,12 @@ The command below imports metadata for the @code{rails} Ruby package: guix import gem rails @end example +You can also ask for a specific version: + +@example +guix import gem @@7.0.4 +@end example + @table @code @item --recursive @itemx -r diff --git a/guix/import/gem.scm b/guix/import/gem.scm index 0e5bb7e635..ad1343bff4 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020, 2021 Ludovic Courtès ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 Taiju HIGASHI ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,10 +82,12 @@ (define-json-mapping make-gem-dependency gem-dependency? (requirements gem-dependency-requirements)) ;string -(define (rubygems-fetch name) - "Return a record for the package NAME, or #f on failure." +(define* (rubygems-fetch name #:optional version) + "Return a record for the package NAME and VERSION, or #f on failure. If VERSION is #f or missing, return the latest version gem." (and=> (json-fetch - (string-append "https://rubygems.org/api/v1/gems/" name ".json")) + (if version + (string-append "https://rubygems.org/api/v2/rubygems/" name "/versions/" version ".json") + (string-append "https://rubygems.org/api/v1/gems/" name ".json"))) json->gem)) (define (ruby-package-name name) @@ -122,8 +125,11 @@ (define (make-gem-sexp name version hash home-page synopsis description (define* (gem->guix-package package-name #:key (repo 'rubygems) version) "Fetch the metadata for PACKAGE-NAME from rubygems.org, and return the -`package' s-expression corresponding to that package, or #f on failure." - (let ((gem (rubygems-fetch package-name))) +`package' s-expression corresponding to that package, or #f on failure. +Optionally include a VERSION string to fetch a specific version gem." + (let ((gem (if version + (rubygems-fetch package-name version) + (rubygems-fetch package-name)))) (if gem (let* ((dependencies-names (map gem-dependency-name (gem-dependencies-runtime @@ -189,4 +195,5 @@ (define* (gem-recursive-import package-name #:optional version) (recursive-import package-name #:repo '() #:repo->guix-package gem->guix-package - #:guix-name ruby-package-name)) + #:guix-name ruby-package-name + #:version version)) diff --git a/guix/scripts/import/gem.scm b/guix/scripts/import/gem.scm index 82deac16ad..7f1e73332b 100644 --- a/guix/scripts/import/gem.scm +++ b/guix/scripts/import/gem.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2022 Taiju HIGASHI ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ (define-module (guix scripts import gem) #:use-module (srfi srfi-37) #:use-module (ice-9 match) #:use-module (ice-9 format) + #:use-module (ice-9 receive) #:export (guix-import-gem)) @@ -42,8 +44,9 @@ (define %default-options '()) (define (show-help) - (display (G_ "Usage: guix import gem PACKAGE-NAME -Import and convert the RubyGems package for PACKAGE-NAME.\n")) + (display (G_ "Usage: guix import gem PACKAGE-NAME[@VERSION] Import and +convert the RubyGems package for PACKAGE-NAME. Optionally, a version can be +specified after the at-sign (@) character.\n")) (display (G_ " -h, --help display this help and exit")) (display (G_ " @@ -86,21 +89,23 @@ (define (parse-options) (_ #f)) (reverse opts)))) (match args - ((package-name) - (let ((code (if (assoc-ref opts 'recursive) - (map (match-lambda - ((and ('package ('name name) . rest) pkg) - `(define-public ,(string->symbol name) - ,pkg)) - (_ #f)) - (gem-recursive-import package-name 'rubygems)) - (let ((sexp (gem->guix-package package-name))) - (if sexp sexp #f))))) - (match code - ((or #f '(#f)) - (leave (G_ "failed to download meta-data for package '~a'~%") - package-name)) - (_ code)))) + ((spec) + (receive (package-name package-version) + (package-name->name+version spec) + (let ((code (if (assoc-ref opts 'recursive) + (map (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + (gem-recursive-import package-name package-version)) + (let ((sexp (gem->guix-package package-name #:version package-version))) + (if sexp sexp #f))))) + (match code + ((or #f '(#f)) + (leave (G_ "failed to download meta-data for package '~a'~%") + package-name)) + (_ code))))) (() (leave (G_ "too few arguments~%"))) ((many ...) diff --git a/tests/gem.scm b/tests/gem.scm index c8fe15398e..6aa0d279dc 100644 --- a/tests/gem.scm +++ b/tests/gem.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 Taiju HIGASHI ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,6 +45,22 @@ (define test-foo-json \"licenses\": [\"MIT\", \"Apache 2.0\"] }") +(define test-foo-v2-json + "{ + \"name\": \"foo\", + \"version\": \"2.0.0\", + \"sha\": \"f3676eafca9987cb5fe263df1edf2538bf6dafc712b30e17be3543a9680547a8\", + \"info\": \"A cool gem\", + \"homepage_uri\": \"https://example.com\", + \"dependencies\": { + \"runtime\": [ + { \"name\": \"bundler\" }, + { \"name\": \"bar\" } + ] + }, + \"licenses\": [\"MIT\", \"Apache 2.0\"] +}") + (define test-bar-json "{ \"name\": \"bar\", @@ -103,6 +120,35 @@ (define test-bundler-json (x (pk 'fail x #f))))) +(test-assert "gem->guix-package with a specific version" + ;; Replace network resources with sample data. + (mock ((guix http-client) http-fetch + (lambda (url . rest) + (match url + ("https://rubygems.org/api/v2/rubygems/foo/versions/2.0.0.json" + (values (open-input-string test-foo-v2-json) + (string-length test-foo-v2-json))) + (_ (error "Unexpected URL: " url))))) + (match (gem->guix-package "foo" #:version "2.0.0") + (('package + ('name "ruby-foo") + ('version "2.0.0") + ('source ('origin + ('method 'url-fetch) + ('uri ('rubygems-uri "foo" 'version)) + ('sha256 + ('base32 + "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk")))) + ('build-system 'ruby-build-system) + ('propagated-inputs ('list 'bundler 'ruby-bar)) + ('synopsis "A cool gem") + ('description "This package provides a cool gem") + ('home-page "https://example.com") + ('license ('list 'license:expat 'license:asl2.0))) + #t) + (x + (pk 'fail x #f))))) + (test-assert "gem-recursive-import" ;; Replace network resources with sample data. (mock ((guix http-client) http-fetch @@ -170,4 +216,71 @@ (define test-bundler-json (x (pk 'fail x #f))))) +(test-assert "gem-recursive-import with a specific version" + ;; Replace network resources with sample data. + (mock ((guix http-client) http-fetch + (lambda (url . rest) + (match url + ("https://rubygems.org/api/v2/rubygems/foo/versions/2.0.0.json" + (values (open-input-string test-foo-v2-json) + (string-length test-foo-v2-json))) + ("https://rubygems.org/api/v1/gems/bar.json" + (values (open-input-string test-bar-json) + (string-length test-bar-json))) + ("https://rubygems.org/api/v1/gems/bundler.json" + (values (open-input-string test-bundler-json) + (string-length test-bundler-json))) + (_ (error "Unexpected URL: " url))))) + (match (gem-recursive-import "foo" "2.0.0") + ((('package + ('name "ruby-bar") + ('version "1.0.0") + ('source + ('origin + ('method 'url-fetch) + ('uri ('rubygems-uri "bar" 'version)) + ('sha256 + ('base32 + "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk")))) + ('build-system 'ruby-build-system) + ('propagated-inputs ('list 'bundler)) + ('synopsis "Another cool gem") + ('description "Another cool gem") + ('home-page "https://example.com") + ('license #f)) ;no licensing info + ('package + ('name "ruby-bundler") + ('version "1.14.2") + ('source + ('origin + ('method 'url-fetch) + ('uri ('rubygems-uri "bundler" 'version)) + ('sha256 + ('base32 + "1446xiz7zg0bz7kgx9jv84y0s4hpsg61dj5l3qb0i00avc1kxd9v")))) + ('build-system 'ruby-build-system) + ('synopsis "Ruby gem bundler") + ('description "Ruby gem bundler") + ('home-page "https://bundler.io/") + ('license 'license:expat)) + ('package + ('name "ruby-foo") + ('version "2.0.0") + ('source + ('origin + ('method 'url-fetch) + ('uri ('rubygems-uri "foo" 'version)) + ('sha256 + ('base32 + "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk")))) + ('build-system 'ruby-build-system) + ('propagated-inputs ('list 'bundler 'ruby-bar)) + ('synopsis "A cool gem") + ('description "This package provides a cool gem") + ('home-page "https://example.com") + ('license ('list 'license:expat 'license:asl2.0)))) + #t) + (x + (pk 'fail x #f))))) + (test-end "gem") -- cgit v1.2.3 From 140a08d44abab24c0476beb201c3d4c21fcde580 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 12 Sep 2022 19:25:32 +0000 Subject: gnu: libharu: Update to 2.4.2. * gnu/packages/pdf.scm (libharu): Update to 2.4.2. [build-system]: Switch to cmake-build-system. [arguments]: Remove #:configure-flags, add #:tests? and #:phases. [inputs]: Sort them. [native-inputs]: Remove. Signed-off-by: Christopher Baines --- gnu/packages/pdf.scm | 60 +++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 73ae2c2d0f..ca4e7f2557 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020, 2022 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2022 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -381,36 +382,37 @@ (define-public python-poppler-qt5 (define-public libharu (package - (name "libharu") - (version "2.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libharu/libharu") - (commit (string-append - "RELEASE_" - (string-join (string-split version #\.) "_"))))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list (string-append "--with-zlib=" - (assoc-ref %build-inputs "zlib")) - (string-append "--with-png=" - (assoc-ref %build-inputs "libpng"))))) - (inputs - (list zlib libpng)) - (native-inputs - (list autoconf automake libtool)) - (home-page "http://libharu.org/") - (synopsis "Library for generating PDF files") - (description - "libHaru is a library for generating PDF files. libHaru does not support + (name "libharu") + (version "2.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libharu/libharu") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jwzqvv81zf5f7zssyixhyjirlp9ddwkbaabd177syb1bxljlsdc")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ; No tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("^install\\(FILES (README\\.md CHANGES) INSTALL DESTINATION .*\\)" + _ files) + (format #f "install(FILES ~a DESTINATION ~a/share/doc/~a-~a)" + files #$output #$name #$version)))))))) + (inputs + (list libpng zlib)) + (home-page "http://libharu.org/") + (synopsis "Library for generating PDF files") + (description + "libHaru is a library for generating PDF files. libHaru does not support reading and editing of existing PDF files.") - (license license:zlib))) + (license license:zlib))) (define-public xpdf (package -- cgit v1.2.3 From 229425fa5360391e08292fdb752af3f3e1c3e117 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 12 Sep 2022 19:25:39 +0000 Subject: gnu: saga: Fix build with newer libHaru. * gnu/packages/geo.scm (saga)[modules, snippet]: New fields. Signed-off-by: Christopher Baines --- gnu/packages/geo.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 2c3a17a201..008e855b48 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2367,7 +2367,14 @@ (define-public saga (version-major version) "/SAGA%20-%20" version "/saga-" version ".tar.gz")) (sha256 - (base32 "008izjs6gvj09abxf16ssl1xy0ay3ljq4jswbggp6wiiq459minv")))) + (base32 "008izjs6gvj09abxf16ssl1xy0ay3ljq4jswbggp6wiiq459minv")) + (modules '((guix build utils))) + (snippet + '(substitute* "saga-gis/src/tools/docs/docs_pdf/doc_pdf.cpp" + (("^#include \n" all) + (string-append all "#include \n")) + (("\\bHPDF_PROJECTING_SCUARE_END\\b") + "HPDF_PROJECTING_SQUARE_END"))))) (build-system cmake-build-system) (native-inputs (list pkg-config swig)) -- cgit v1.2.3 From c00e1c87f219ab9947204af53afff6ccf812fa91 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 12 Sep 2022 19:25:45 +0000 Subject: gnu: vtk: Use system libHaru. * gnu/packages/image-processing.scm (vtk)[snippet]: Delete bundled libHaru and patch VTK for newer libHaru. Reindent and remove trailing boolean. [arguments]: Specify external libHaru in configure flags. [inputs]: Add libharu. Signed-off-by: Christopher Baines --- gnu/packages/image-processing.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index aa8efd97c6..a8f40c4454 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -324,14 +324,18 @@ (define-public vtk (snippet '(begin (for-each - (lambda (dir) - (delete-file-recursively - (string-append "ThirdParty/" dir "/vtk" dir))) - ;; pugixml depended upon unconditionally - '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" - "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "lz4" - "netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib")) - #t)))) + (lambda (dir) + (delete-file-recursively + (string-append "ThirdParty/" dir "/vtk" dir))) + ;; pugixml depended upon unconditionally + '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" + "glew" "hdf5" "jpeg" "jsoncpp" "libharu" "libproj" + "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora" + "tiff" "zlib")) + (substitute* "IO/ExportPDF/vtkPDFContextDevice2D.cxx" + (("\\bHPDF_UINT16 (noPen|dash|dot|denseDot|dashDot|dashDotDot)\\b" + _ var) + (string-append "HPDF_REAL " var))))))) (properties `((release-monitoring-url . "https://vtk.org/download/"))) (build-system cmake-build-system) (arguments @@ -348,6 +352,7 @@ (define-public vtk "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON" @@ -381,6 +386,7 @@ (define-public vtk glew glu hdf5 + libharu libjpeg-turbo jsoncpp libtheora -- cgit v1.2.3 From c967d1153cae419e4acbe0dbed8f558d95ced0e3 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Sun, 11 Sep 2022 16:23:37 +0200 Subject: gnu-maintenance: Support // URLs in latest-html-release. This makes "./pre-inst-env guix refresh -u" download the release tarball from the right place -- previously, it downloaded from https://www.libreoffice.org//download.documentfoundation.org/libreoffice/src/7.4.0/libreoffice-7.4.0.3.tar.xz?idx=1 whereas it should download from https://download.documentfoundation.org/libreoffice/src/7.4.0/libreoffice-7.4.0.3.tar.xz?idx=1 instead. * guix/gnu-maintenance.scm (latest-html-release)[url-release]: Adjust computation in the case of an absolute URI-reference without a scheme. * tests/gnu-maintenance.scm ("latest-html-release, scheme-less URIs"): Test it. Signed-off-by: Christopher Baines --- guix/gnu-maintenance.scm | 7 +++++++ tests/gnu-maintenance.scm | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index e7edbf6656..1ffa408666 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -499,6 +500,12 @@ (define (url->release url) (base-url (string-append base-url directory)) (url (cond ((and=> (string->uri url) uri-scheme) ;full URL? url) + ;; full URL, except for URI scheme. Reuse the URI + ;; scheme of the document that contains the link. + ((string-prefix? "//" url) + (string-append + (symbol->string (uri-scheme (string->uri base-url))) + ":" url)) ((string-prefix? "/" url) ;absolute path? (let ((uri (string->uri base-url))) (uri->string diff --git a/tests/gnu-maintenance.scm b/tests/gnu-maintenance.scm index c04d8ba733..89b0684c25 100644 --- a/tests/gnu-maintenance.scm +++ b/tests/gnu-maintenance.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2021 Ludovic Courtès +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,10 @@ (define-module (test-gnu-maintenance) #:use-module (guix gnu-maintenance) + #:use-module (guix tests) + #:use-module (guix tests http) + #:use-module (guix upstream) + #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) #:use-module (ice-9 match)) @@ -55,4 +60,28 @@ (define-module (test-gnu-maintenance) ("mpg321_0.3.2.orig.tar.gz" "0.3.2") ("bvi-1.4.1.src.tar.gz" "1.4.1"))))) +(test-assert "latest-html-release, scheme-less URIs" + (with-http-server + `((200 " + +Releases (on another domain)! + +version 1 + +")) + (let () + (define package + (dummy-package "foo" + (source + (dummy-origin + (uri (string-append (%local-url) "/foo-1.tar.gz")))) + (properties + `((release-monitoring-url . ,(%local-url)))))) + (define update ((upstream-updater-latest %generic-html-updater) package)) + (define expected-new-url "http://another-site/foo-2.tar.gz") + (and (pk 'u update) + (equal? (upstream-source-version update) "2") + (equal? (list expected-new-url) (upstream-source-urls update)))))) + (test-end) -- cgit v1.2.3 From 620ca301341a96bb8cac941b71a67902872c2b2d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Sep 2022 22:20:08 -0400 Subject: gnu: linux-libre 5.19: Update to 5.19.9. * gnu/packages/linux.scm (linux-libre-5.19-version): Update to 5.19.9. (linux-libre-5.19-pristine-source, deblob-scripts-5.19): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8c33bd6fcc..47f79d73c8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,17 +353,17 @@ (define (%upstream-linux-source version hash) ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.19-version "5.19.8") +(define-public linux-libre-5.19-version "5.19.9") (define-public linux-libre-5.19-gnu-revision "gnu") (define deblob-scripts-5.19 (linux-libre-deblob-scripts linux-libre-5.19-version linux-libre-5.19-gnu-revision (base32 "1lk90psz33ldb8aiaws4iayhycl5bmywr6badvzffjpr87s5phxw") - (base32 "1ph67fvg5qvlkh4cynrrmvkngkb0sw6k90b1mwy9466s24khn05i"))) + (base32 "092myqjixvy1k3ylcj0hfc4whfxapjvxsxm4gk30a3jv5dnh7mly"))) (define-public linux-libre-5.19-pristine-source (let ((version linux-libre-5.19-version) - (hash (base32 "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1"))) + (hash (base32 "0dvzjbyknzlx4ndz77fsm6v28fj2chxbq1z85fbc3bckcscbbm8a"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.19))) -- cgit v1.2.3 From eba98e68e6759d965c80917a03e25180f0951de3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Sep 2022 22:20:25 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.68. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.68. (linux-libre-5.15-pristine-source, deblob-scripts-5.15): Update hashes. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 47f79d73c8..f019b6325d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -372,17 +372,17 @@ (define-public linux-libre-5.19-pristine-source ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.67") +(define-public linux-libre-5.15-version "5.15.68") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision (base32 "0vj60bra81fmbx3lz924czbhxs4dmvd4d584g9mcs80b7c4q52kg") - (base32 "1r189c704jvizk452zcsm9v3g27ybjcjchjwxazsy3nx0wdwx7si"))) + (base32 "048r4synfax2ajyzlmp672b68yshxwlfccdah2vz1kh88rqfmgsc"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys"))) + (hash (base32 "0zlb44bwpc0hwfynzz5v5b3lkv4aha7w5737ns1qb8cvbk5v7fqp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.2.3 From cf6bd972a4a33ec6a0842db41ee5da3ee0fe6f4b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Sep 2022 22:20:41 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.143. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.143. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f019b6325d..056a01b994 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -387,7 +387,7 @@ (define-public linux-libre-5.15-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.142") +(define-public linux-libre-5.10-version "5.10.143") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -397,7 +397,7 @@ (define deblob-scripts-5.10 (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz"))) + (hash (base32 "14af0lsvgh1k0fh283d0nrm1pkrk2kaf2mz0ab59vlvjybg9wb7s"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 75c77caa1a43be9b40afc73974aec2ffbae32272 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Sep 2022 22:21:02 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.213. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.213. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 056a01b994..d636ca1681 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -402,7 +402,7 @@ (define-public linux-libre-5.10-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.212") +(define-public linux-libre-5.4-version "5.4.213") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -412,7 +412,7 @@ (define deblob-scripts-5.4 (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9"))) + (hash (base32 "1wdssqmac66zqsnq5lx2z8ampa0rd3qswg0gm1sh6n3y8xlf2z76"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 04643c276fbbc0f5b253c62580a597e76e0f25d2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Sep 2022 22:21:23 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.258. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.258. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d636ca1681..74195f3c3e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -417,7 +417,7 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.257") +(define-public linux-libre-4.19-version "4.19.258") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -427,7 +427,7 @@ (define deblob-scripts-4.19 (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga"))) + (hash (base32 "002sw8b272dzkp3vff0x89sbj5p3vrrikqygfdgrsxv7k3w4459x"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From ffef8e69acc19a13fd2caa8d865f36c5f543b462 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Sep 2022 22:21:37 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.293. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.293. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 74195f3c3e..2a74f07f8c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -432,7 +432,7 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.292") +(define-public linux-libre-4.14-version "4.14.293") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -442,7 +442,7 @@ (define deblob-scripts-4.14 (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h"))) + (hash (base32 "047gl9nqrvpi9jaxlmhfnx848qvnrhf13710ka8fwn3lyv22k342"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 75c3257c1f65f1a2837cffa7db8cb009848ec6e5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 15 Sep 2022 22:21:52 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.328. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.328. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2a74f07f8c..91701ed055 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -447,7 +447,7 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.327") +(define-public linux-libre-4.9-version "4.9.328") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -457,7 +457,7 @@ (define deblob-scripts-4.9 (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1lh63viynf9f7vl0a52mnal8jack9lbqfsfammwkxi3kafpw30r2"))) + (hash (base32 "1px2np3k796cjwq1sp9gfxyql6hqyqya82vq9cb5y0canq6fqmg8"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 64c49de49e2dec471dc948c91e71e5a74f5c47b9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 17 Sep 2022 23:01:24 +0200 Subject: gnu: emacs-logview: Update to 0.15.1. * gnu/packages/emacs-xyz.scm (emacs-logview): Update to 0.15.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d99df6cc69..676e3513ad 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21005,7 +21005,7 @@ (define-public emacs-helpful (define-public emacs-logview (package (name "emacs-logview") - (version "0.15") + (version "0.15.1") (source (origin (method git-fetch) @@ -21014,7 +21014,7 @@ (define-public emacs-logview (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08bn7fj336krlrsf7flk0fgx9mdkd44vq8sxyx6s1c1q5bc0hqnk")))) + (base32 "1khri5632pjirj191x3ps94s4pyrwapf1pbrkmqqp0d26b50d3s2")))) (propagated-inputs (list emacs-datetime emacs-extmap)) (build-system emacs-build-system) -- cgit v1.2.3 From ee0768c7924134f7b4b215670c2a3ae481268fab Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 17 Sep 2022 23:03:12 +0200 Subject: gnu: emacs-parsebib: Update to 4.3. * gnu/packages/emacs-xyz.scm (emacs-parsebib): Update to 4.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 676e3513ad..2ab80eeb6a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19292,7 +19292,7 @@ (define-public emacs-org-auto-expand (define-public emacs-parsebib (package (name "emacs-parsebib") - (version "4.2") + (version "4.3") (source (origin (method git-fetch) @@ -19301,7 +19301,7 @@ (define-public emacs-parsebib (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0da4b6d65bq9xhyhq7h9g315zg6g5q9435vz870la966rgav5szd")))) + (base32 "0vcl2wvxwpr62c9ym0fm3qaxzhjcrpk4r6r0zaqhkvlf8qr3rg8y")))) (build-system emacs-build-system) (home-page "https://github.com/joostkremers/parsebib") (synopsis "Library for parsing @file{.bib} files") -- cgit v1.2.3 From ba189bdc7a1936afa6d786ff5a2cf4fd08264f18 Mon Sep 17 00:00:00 2001 From: Trevor Richards Date: Tue, 13 Sep 2022 08:21:37 -0700 Subject: gnu: Add emacs-transpose-mark. * gnu/packages/emacs-xyz.scm (emacs-transpose-mark): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2ab80eeb6a..91beb65926 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15773,6 +15773,31 @@ (define-public emacs-transpose-frame selected frame.") (license license:bsd-2))) +(define-public emacs-transpose-mark + ;; XXX: Upstream made no release so far, and did not add a Version keyword. + (let ((commit "667327602004794de97214cf336ac61650ef75b7") + (revision "0")) + (package + (name "emacs-transpose-mark") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kwrooijen/transpose-mark") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x")))) + (build-system emacs-build-system) + (home-page "https://github.com/kwrooijen/transpose-mark") + (synopsis "Library for transposing lines and regions") + (description "Transpose mark provides some commands that makes +transposing lines and regions easier. You can mark a line and transpose it +with a line at point, or mark a region and transpose it with another region +a point. The plugin provides visual feedback for marked regions.") + (license license:gpl3+)))) + (define-public emacs-key-chord (package (name "emacs-key-chord") -- cgit v1.2.3 From ee58eab7d569b4fb06161e03f67cae4487e64063 Mon Sep 17 00:00:00 2001 From: Nicolas Graves via Guix-patches via Date: Tue, 13 Sep 2022 15:56:03 +0200 Subject: gnu: Add emacs-orca. * gnu/packages/emacs-xyz.scm (emacs-orca): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 91beb65926..af5646c78c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -30680,6 +30680,34 @@ (define-public emacs-haskell-snippets snippets for Emacs.") (license license:expat)))) +(define-public emacs-orca + ;; XXX: Upstream did not tag any commit so far. Base version is extracted + ;; from Version keyword. + (let ((commit "0687f416a5573f63b691d384454f5a793266ed97") + (revision "0")) + (package + (name "emacs-orca") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abo-abo/orca") + (commit commit))) + (sha256 + (base32 "00a363vkqvryw5s7pj0kh8pqq5vvbf1pmbzz0b1z1fckwr49sv0f")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-zoutline)) + (home-page "https://github.com/abo-abo/orca") + (synopsis "Handler for Org Capture") + (description + "This package provides several convenient recipes for configuring Org +Capture, mainly for capturing from a browser. It can match URLs and inject +the capture in a targeted Org file, under a targeted heading. The more this +package is configured, the less refiling is needed on your captures: they will +go directly to where they belong.") + (license license:gpl3+)))) + (define-public emacs-org-roam (package (name "emacs-org-roam") -- cgit v1.2.3 From 90174c77cf59fd9681eb7442a92015cd61c8495d Mon Sep 17 00:00:00 2001 From: Nicolas Graves via Guix-patches via Date: Tue, 13 Sep 2022 16:08:44 +0200 Subject: gnu: Add emacs-app-launcher. * gnu/packages/emacs-xyz.scm (emacs-app-launcher): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index af5646c78c..f471032fc8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2605,6 +2605,31 @@ (define-public emacs-ace-link letter to each link using avy.") (license license:gpl3+))) +(define-public emacs-app-launcher + ;; XXX: Upstream did not tag any commit so far. Base version is extracted + ;; from Version keyword. + (let ((commit "d5015e394b0a666a8c7c4d4bdf786266e773b145") + (revision "0")) + (package + (name "emacs-app-launcher") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SebastienWae/app-launcher") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0l97ajy27awydyd4gc6323wyhpm5vm2db6i0lp5gqaxi9fp7jivp")))) + (build-system emacs-build-system) + (home-page "https://github.com/SebastienWae/app-launcher") + (synopsis "Use Emacs standard completion to launch applications") + (description "This package defines the @code{app-launcher-run-app} +command, which uses Emacs standard completion to select an application +installed on your machine and launch it.") + (license license:gpl3+)))) + (define-public emacs-auto-sudoedit (package (name "emacs-auto-sudoedit") -- cgit v1.2.3 From 1225fe013e2f5e91a7a05be745e5cbf8ae507b02 Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sat, 17 Sep 2022 22:41:58 +0000 Subject: gnu: Add emacs-org-roam-ui. * gnu/packages/emacs-xyz.scm (emacs-org-roam-ui): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f471032fc8..17740756b5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -30795,6 +30795,34 @@ (define-public emacs-org-roam personal wiki.") (license license:gpl3+))) +(define-public emacs-org-roam-ui + (let ((commit "c75fc7506ee7f03840a9a93ed9336d7ed24551aa") + (revision "0")) + (package + (name "emacs-org-roam-ui") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/org-roam/org-roam-ui") + (commit commit))) + (sha256 + (base32 "0mkcd2622np8s5qz2zvx7lch6dc586xqmn6914gi4ym7nvklf3zy")))) + (build-system emacs-build-system) + (arguments + (list #:include #~(cons "^out" %default-include))) + (propagated-inputs + (list emacs-org-roam emacs-simple-httpd emacs-websocket)) + (home-page "https://github.com/org-roam/org-roam-ui") + (synopsis "Web User Interface for Org Roam") + (description + "Org Roam UI is meant as a successor of Org Roam server that extends +functionality of Org Roam with a web app that runs side-by-side with Emacs, +providing a web interface for navigating around notes created within Org +Roam.") + (license license:gpl3+)))) + (define-public emacs-org-roam-bibtex (package (name "emacs-org-roam-bibtex") -- cgit v1.2.3 From 065b135ee14668d1cbe679a91d877e60f25cf3dc Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sat, 17 Sep 2022 23:12:01 +0000 Subject: gnu: Add emacs-suneater-theme. * gnu/packages/emacs-xyz.scm (emacs-suneater-theme): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 17740756b5..0d1843df95 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1348,6 +1348,28 @@ (define-public emacs-theme-sorcery Apprentice and Sourcerer.") (license license:gpl3+)))) +(define-public emacs-suneater-theme + (package + (name "emacs-suneater-theme") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~plattfot/suneater-theme") + (commit version))) + (sha256 + (base32 + "0nlam8f8ly86y7p2dn10y9ixnm7bhmigsx7si4cjynh6aiyczyds")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://git.sr.ht/~plattfot/suneater-theme") + (synopsis "Minimalistic dark theme for Emacs") + (description + "Suneater is a dark, minimalistic Emacs theme. It was based on Sunburst +theme but now takes more inspiration from the Nano theme.") + (license license:gpl3+))) + (define-public emacs-treepy (package (name "emacs-treepy") -- cgit v1.2.3 From 373731737fbe082e5e684eae78629df16e3fd61b Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sat, 17 Sep 2022 23:26:19 +0000 Subject: gnu: Add emacs-emprise. * gnu/packages/emacs-xyz.scm (emacs-emprise): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0d1843df95..cf0f75a573 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2594,6 +2594,30 @@ (define-public emacs-emms-mode-line-cycle within a specified width. It is useful for displaying long track titles.") (license license:gpl3+))) +(define-public emacs-emprise + (package + (name "emacs-emprise") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~plattfot/emprise") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0yddvvpjdcgsiwv24jbddkgl5r1lxgz037akjln6z9acx9qrc8px")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://sr.ht/~plattfot/emprise") + (synopsis "Control MPRIS supported media players from Emacs") + (description "This package provides a set of commands to control media +players that supports the Media Player Remote Interfacing +Specification (MPRIS) protocol from Emacs. It uses Emacs' Completing Read +framework as the user interface, which integrates well with Vertico or +Selectrum.") + (license license:gpl3+))) + ;;; ;;; Miscellaneous. -- cgit v1.2.3 From e63f7d8086a3d66a33059fe4122b76aa1bcaa651 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 18 Sep 2022 13:28:41 +0200 Subject: gnu: asymptote: Update to 2.83. * gnu/packages/plotutils.scm (asymptote): Update to 2.83. --- gnu/packages/plotutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index a5e1a1ad55..678963575e 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -269,14 +269,14 @@ (define-public ploticus (define-public asymptote (package (name "asymptote") - (version "2.82") + (version "2.83") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "13blmsapbai4hqynyj1r1sjpypdv6frfassl2f2x7j2ql1dbqvsg")) + (base32 "18w8nf0p1b3h74sk1b7w96kq5gcaq09idi4771ini7p594gsfg7y")) (modules '((guix build utils))) (snippet ;; Remove bundled RapidJSON. -- cgit v1.2.3 From 52e55b38f446784209866dcf4bff23b7f604ba24 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sun, 18 Sep 2022 14:16:08 +0200 Subject: gnu: emacs-polymode: Add patch for native compilation. * gnu/packages/emacs-xyz.scm (emacs-polymode)[source]: Add patch. * gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Nicolas Goaziou --- gnu/local.mk | 2 ++ gnu/packages/emacs-xyz.scm | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index de460c2017..542c06e221 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -52,6 +52,7 @@ # Copyright © 2022 Artyom V. Poptsov # Copyright © 2022 John Kehayias # Copyright © 2022 muradm +# Copyright © 2022 Hilton Chain # # This file is part of GNU Guix. # @@ -1046,6 +1047,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ + %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cf0f75a573..fd861d94f5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17621,7 +17621,10 @@ (define-public emacs-polymode (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn")))) + (base32 "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn")) + (patches + ;; XXX: Cherry-picked from upstream, remove when bumping to 0.2.3. + (search-patches "emacs-polymode-fix-lexical-variable-error.patch")))) (build-system emacs-build-system) (home-page "https://github.com/polymode/polymode") (synopsis "Framework for multiple Emacs modes based on indirect buffers") -- cgit v1.2.3 From 24278280caa7296897fe214eb3b8c5f22a7f9b5e Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 26 Mar 2022 14:59:01 +0100 Subject: gnu: Add emacs-sqlite3-api. * gnu/packages/emacs-xyz.scm (emacs-sqlite3-api): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fd861d94f5..30bd0ca48b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6233,6 +6233,64 @@ (define-public emacs-sqlite It is not intended as a user interface.") (license license:gpl3+)))) +(define-public emacs-sqlite3-api + (package + (name "emacs-sqlite3-api") + (version "0.16") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pekingduck/emacs-sqlite3-api") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yrfwb3yvhp1ib4izxh1ds68b3zw8gjkjhlk1kivarxnfjnjnly2")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? (not (%current-target-system)) + #:test-command #~(list "make" "test" "EMACS=emacs") + #:modules '((guix build emacs-build-system) + (guix build emacs-utils) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-module-load + (lambda _ + (make-file-writable "sqlite3.el") + (emacs-substitute-sexps "sqlite3.el" + ("(require 'sqlite3-api nil t)" + (string-append + "(module-load \"" #$output "/lib/sqlite3-api.so\")"))))) + (add-before 'check 'build-emacs-module + (lambda _ + ;; Remove code that fetches constants from the SQLite website + ;; and the call to generate a timestamp. + (invoke "sed" "--in-place" "3,4d;24,28d;31d" "tools/gen-consts.sh") + ;; Remove filter logic from the script that generates the constants. + (invoke "sed" "--in-place" "7,11d;18,22d" "tools/gen-consts.py") + ;; Generate the consts.c file. + (invoke "make" "--directory=tools") + ;; Remove the SQLITE_STATIC and SQLITE_TRANSIENT + ;; constants. They cause a compilation warning and would have + ;; been removed by the original script. + (invoke "sed" "--in-place" "/ifdef SQLITE_STATIC/,+2d" "consts.c") + (invoke "sed" "--in-place" "/ifdef SQLITE_TRANSIENT/,+2d" "consts.c") + ;; Compile the shared object file. + (invoke "make" #$(string-append "CC=" (cc-for-target))) + ;; Move the shared object file into /lib. + (install-file "sqlite3-api.so" + (string-append #$output "/lib"))))))) + (native-inputs (list python sed)) + (inputs (list sqlite)) + (home-page "https://github.com/pekingduck/emacs-sqlite3-api") + (synopsis "Dynamic module for Emacs to access the SQLite C interface") + (description "This package provides a dynamic module for Emacs that allows +direct access to the SQLite C interface. It only exposes a subset of the full +SQLite C interface, but should satisfy most user's needs.") + (license license:gpl3+))) + (define-public emacs-sr-speedbar (let ((commit "77a83fb50f763a465c021eca7343243f465b4a47") (revision "0")) -- cgit v1.2.3 From 9a4ea7059d33caebe54406b77397dd118be9ea88 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 18 Sep 2022 15:53:28 +0200 Subject: gnu: gitg: Use gtksourceview-4. * gnu/packages/gnome.scm (gitg)[inputs]: Replace gtksourceview with gtksourceview-4. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 282c388b18..4a1d979e99 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11838,7 +11838,7 @@ (define-public gitg gsettings-desktop-schemas gspell gtk+ - gtksourceview + gtksourceview-4 json-glib libdazzle libgee -- cgit v1.2.3 From d98542a6a95fd71e3aab79a9c1c0cc6700caad4c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 18 Sep 2022 15:58:24 +0200 Subject: gnu: Add missing emacs-polymode patch. This fixes up commit 52e55b38f446784209866dcf4bff23b7f604ba24. * gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch: New file. --- ...emacs-polymode-fix-lexical-variable-error.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch 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 0000000000..77a8452c2a --- /dev/null +++ b/gnu/packages/patches/emacs-polymode-fix-lexical-variable-error.patch @@ -0,0 +1,37 @@ +From 8b83fa772a71efc9dc030c43db2cba944e4338c1 Mon Sep 17 00:00:00 2001 +From: Kien Nguyen +Date: Wed, 19 May 2021 23:15:01 +0900 +Subject: [PATCH] Fix using of temporary lexical variable causes error in + native compiling + +--- + polymode-core.el | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/polymode-core.el b/polymode-core.el +index e7d40be..ef316f8 100644 +--- a/polymode-core.el ++++ b/polymode-core.el +@@ -2088,14 +2088,14 @@ Elements of LIST can be either strings or symbols." + (stringp pm--output-file) + (pm--file-mod-time pm--output-file))) + (imt (and omt (pm--file-mod-time pm--input-file))) +- (action (if is-exporter "exporting" "weaving")) + (ofile (if (and imt (time-less-p imt omt)) + (progn + (message "Not re-%s as input file '%s' hasn't changed" +- (file-name-nondirectory ifile) action) ++ (if is-exporter "exporting" "weaving") ++ (file-name-nondirectory ifile)) + pm--output-file) + (message "%s '%s' with '%s' ..." +- (capitalize action) ++ (if is-exporter "EXPORTING" "WEAVING") + (file-name-nondirectory ifile) + (eieio-object-name processor)) + (let ((fn (with-no-warnings + +base-commit: 44265e35161d77f6eaa09388ea2256b89bd5dcc8 +-- +2.37.2 + -- cgit v1.2.3 From 5811d876c35022857ed6a7e2e21763b30a4ec800 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 18 Sep 2022 16:01:00 +0200 Subject: gnu: polari: Add missing input. * gnu/packages/gnome.scm (polari)[inputs]: Add libadwaita. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a1d979e99..d3212886bd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12104,6 +12104,7 @@ (define-public polari gspell gtk gjs + libadwaita libsecret libsoup telepathy-glib -- cgit v1.2.3 From 6c3ccc6b1f60dd55a4c499d895f79612244158c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Sep 2022 02:22:56 +0200 Subject: gnu: python-ufo2ft: Don't use pytest-runner. pytest-runner is deprecated and does not work properly with the newer setuptools in Python 3.10 for this package. * gnu/packages/fontutils.scm (python-ufo2ft)[arguments]: Override check phase. [native-inputs]: Remove PYTHON-PYTEST-RUNNER. --- gnu/packages/fontutils.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 3806d78b1e..9b7f1ac879 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -447,8 +447,15 @@ (define-public python-ufo2ft (sha256 (base32 "068hm62s1iphyg66w96vgiif6ahpcsaf8fr44rk6jdf71f6fyqd5")))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (native-inputs - (list python-pytest python-pytest-runner python-setuptools-scm)) + (list python-pytest python-setuptools-scm)) (propagated-inputs (list python-booleanoperations python-cffsubr -- cgit v1.2.3 From 50108016764dcb4f1e328ab24c9df6c5710ccb61 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 01:45:26 +0200 Subject: gnu: Explicitly use meson@0.60 in packages that don't support 0.63. * gnu/packages/gnome.scm (gnome-disk-utility, gnome-screenshot, dconf-editor)[arguments]: Add #:meson. --- gnu/packages/gnome.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d3212886bd..c7e5115802 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2292,6 +2292,7 @@ (define-public gnome-disk-utility (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlogind=libelogind") + #:meson ,meson-0.60 #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-gtk-update-icon-cache @@ -9693,7 +9694,8 @@ (define-public gnome-screenshot "15wmikwk62cdi93gas77nqh4fbhlrxrncyfmcd1gfa34jbn7vnsa")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t + `(#:meson ,meson-0.60 + #:glib-or-gtk? #t #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-gtk-update-icon-cache @@ -9735,6 +9737,8 @@ (define-public dconf-editor (base32 "1qvrxrk1h8bd75xwasxbvlkqrw6xkavjimvc7sslkw6lvb3z86jp")))) (build-system meson-build-system) + (arguments + (list #:meson meson-0.60)) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache -- cgit v1.2.3 From 2104efcddfd7649839673886ec44f77dcd5b5041 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 19:50:42 +0200 Subject: gnu: Explicitly use OpenSSL 1.1 in packages that don't support 3.0. * gnu/packages/php.scm (php)[inputs]: Change from OPENSSL to OPENSSL-1.1. * gnu/packages/ntp.scm (ntp)[inputs]: Likewise. --- gnu/packages/ntp.scm | 2 +- gnu/packages/php.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index b942703ff3..a27c1c6a12 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -155,7 +155,7 @@ (define-public ntp #t)))) (native-inputs (list which pkg-config)) (inputs - `(("openssl" ,openssl) + `(("openssl" ,openssl-1.1) ("libevent" ,libevent) ;; Build with POSIX capabilities support on GNU/Linux. This allows 'ntpd' ;; to run as non-root (when invoked with '-u'.) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index fdea27160d..645a8edee1 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -381,7 +381,7 @@ (define-public php ("libzip" ,libzip) ("oniguruma" ,oniguruma) ("openldap" ,openldap) - ("openssl" ,openssl) + ("openssl" ,openssl-1.1) ("pcre" ,pcre2) ("postgresql" ,postgresql) ("readline" ,readline) -- cgit v1.2.3 From 94827144d18056713c908dbfde6c399c48e9634a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 16 Sep 2022 00:31:21 +0200 Subject: gnu: gnome-settings-daemon: Add NSS on RUNPATH. * gnu/packages/gnome.scm (gnome-settings-daemon)[arguments]: Ensure NSS ends up on RUNPATH. --- gnu/packages/gnome.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c7e5115802..c8a49040f4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5886,7 +5886,10 @@ (define-public gnome-settings-daemon "-Dsystemd=false" ;; Otherwise, the RUNPATH will lack the final path component. (string-append "-Dc_link_args=-Wl,-rpath=" #$output - "/lib/gnome-settings-daemon-3.0")) + "/lib/gnome-settings-daemon-3.0:" + ;; Also add NSS because for some reason Meson + ;; > 0.60 does not add it automatically (XXX). + (search-input-directory %build-inputs "lib/nss"))) #:phases #~(modify-phases %standard-phases (add-before 'configure 'set-baobab-file-name -- cgit v1.2.3 From 08124aa8d6bb492e1ce9e9bc9d913bcb3fe0b40d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Sep 2022 13:13:27 +0200 Subject: gnu: python-cython: Add 0.29.32. * gnu/packages/python-xyz.scm (python-cython-0.29.32): New variable. --- gnu/packages/python-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ff9f458167..92e0c9dbe8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5612,6 +5612,18 @@ (define-public python-cython writing C extensions for Python as easy as Python itself.") (license license:asl2.0))) +;; Newer version required for Pandas. +(define-public python-cython-0.29.32 + (package + (inherit python-cython) + (version "0.29.32") + (source (origin + (method url-fetch) + (uri (pypi-uri "Cython" version)) + (sha256 + (base32 + "1xqsihpqnfal29nb5kmw8z71nd4jbsnbz7p3lkr094xpb13wycw7")))))) + (define-public python-cython-3 (package (inherit python-cython) -- cgit v1.2.3 From ce3b51a4c6bef22e35ca04a945917510627fc3a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 30 Aug 2022 20:08:22 +0200 Subject: gnu: python-pandas: Update to 1.4.4. * gnu/packages/python-science.scm (python-pandas): Update to 1.4.4. [native-inputs]: Change from PYTHON-CYTHON to PYTHON-CYTHON-0.29.32. --- gnu/packages/python-science.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index d1698e5f67..d828399f79 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -348,13 +348,13 @@ (define-public python-trimesh (define-public python-pandas (package (name "python-pandas") - (version "1.4.2") + (version "1.4.4") (source (origin (method url-fetch) (uri (pypi-uri "pandas" version)) (sha256 - (base32 "04lsak3j5hq2hk0vfjf532rdxdqmg2akamdl4yl3qipihp2izg4j")))) + (base32 "0ryv66s9cvd27q6a985vv556k2qlnlrdna2z7qc7bdhphrrhsv5b")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) @@ -422,7 +422,7 @@ (define-public python-pandas (inputs (list which xclip xsel)) (native-inputs - (list python-cython + (list python-cython-0.29.32 python-beautifulsoup4 python-lxml python-html5lib -- cgit v1.2.3