Changeset 5516569 in dotfiles for guix/.guix-packages/emacs.scm

Timestamp:

Oct 6, 2022, 12:26:10 PM (2 years ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

2107e51

Parents:

a48604f

git-author:

Mikhail Kirillov <w96k@…> (10/06/22 12:24:57)

git-committer:

Mikhail Kirillov <w96k@…> (10/06/22 12:26:10)

Message:

Add changes to config

File:

• guix/.guix-packages/emacs.scm (modified) (2 diffs)

guix/.guix-packages/emacs.scm

@@ -26 +26 @@
   #:use-module (ice-9 match))
 
-(define-public emacs
-  (package
-    (name "emacs")
-    (version "28.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/emacs/emacs-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98"))
-              (patches (search-patches "emacs-exec-path.patch"
-                                       "emacs-fix-scheme-indent-function.patch"
-                                       "emacs-source-date-epoch.patch"))
-              (modules '((guix build utils)))
-              (snippet
-               '(with-directory-excursion "lisp"
-                  ;; Delete the bundled byte-compiled elisp files and generated
-                  ;; autoloads.
-                  (for-each delete-file
-                            (append (find-files "." "\\.elc$")
-                                    (find-files "." "loaddefs\\.el$")
-                                    (find-files "eshell" "^esh-groups\\.el$")))
-
-                  ;; Make sure Tramp looks for binaries in the right places on
-                  ;; remote Guix System machines, where 'getconf PATH' returns
-                  ;; something bogus.
-                  (substitute* "net/tramp-sh.el"
-                    ;; Patch the line after "(defcustom tramp-remote-path".
-                    (("\\(tramp-default-remote-path")
-                     (format #f "(tramp-default-remote-path ~s ~s ~s ~s "
-                             "~/.guix-profile/bin" "~/.guix-profile/sbin"
-                             "/run/current-system/profile/bin"
-                             "/run/current-system/profile/sbin")))
-
-                  ;; Make sure Man looks for C header files in the right
-                  ;; places.
-                  (substitute* "man.el"
-                    (("\"/usr/local/include\"" line)
-                     (string-join
-                      (list line
-                            "\"~/.guix-profile/include\""
-                            "\"/var/guix/profiles/system/profile/include\"")
-                      " ")))
-                  #t))))
-    (build-system glib-or-gtk-build-system)
-    (arguments
-     `(#:tests? #f                      ; no check target
-       #:configure-flags (list "--with-modules"
-                               "--with-cairo"
-                               "--disable-build-details")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-program-file-names
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* '("src/callproc.c"
-                            "lisp/term.el"
-                            "lisp/htmlfontify.el"
-                            "lisp/textmodes/artist.el"
-                            "lisp/progmodes/sh-script.el")
-               (("\"/bin/sh\"")
-                (format #f "~s" (which "sh"))))
-             (substitute* "lisp/doc-view.el"
-               (("\"(gs|dvipdf|ps2pdf)\"" all what)
-                (let ((ghostscript (assoc-ref inputs "ghostscript")))
-                  (if ghostscript
-                      (string-append "\"" ghostscript "/bin/" what "\"")
-                      all)))
-               (("\"(pdftotext)\"" all what)
-                (let ((poppler (assoc-ref inputs "poppler")))
-                  (if poppler
-                      (string-append "\"" poppler "/bin/" what "\"")
-                      all))))
-             ;; match ".gvfs-fuse-daemon-real" and ".gvfsd-fuse-real"
-             ;; respectively when looking for GVFS processes.
-             (substitute* "lisp/net/tramp-gvfs.el"
-               (("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process)
-                (format #f "(or ~a (tramp-compat-process-running-p ~s))"
-                        all (string-append "." process "-real"))))
-             #t))
-         (add-before 'configure 'fix-/bin/pwd
-           (lambda _
-             ;; Use `pwd', not `/bin/pwd'.
-             (substitute* (find-files "." "^Makefile\\.in$")
-               (("/bin/pwd")
-                "pwd"))
-             #t))
-         (add-after 'install 'install-site-start
-           ;; Use 'guix-emacs' in "site-start.el", which is used autoload the
-           ;; Elisp packages found in EMACSLOADPATH.
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out      (assoc-ref outputs "out"))
-                    (lisp-dir (string-append out "/share/emacs/site-lisp"))
-                    (emacs    (string-append out "/bin/emacs")))
-
-               ;; This is duplicated from emacs-utils to prevent coupling.
-               (define* (emacs-byte-compile-directory dir)
-                 (let ((expr `(progn
-                               (setq byte-compile-debug t)
-                               (byte-recompile-directory
-                                (file-name-as-directory ,dir) 0 1))))
-                   (invoke emacs "--quick" "--batch"
-                           (format #f "--eval=~s" expr))))
-
-               (copy-file (assoc-ref inputs "guix-emacs.el")
-                          (string-append lisp-dir "/guix-emacs.el"))
-               (with-output-to-file (string-append lisp-dir "/site-start.el")
-                 (lambda ()
-                   (display
-                    (string-append
-                     "(when (require 'guix-emacs nil t)\n"
-                     "  (guix-emacs-autoload-packages)\n"
-                     "  (advice-add 'package-load-all-descriptors"
-                     " :after #'guix-emacs-load-package-descriptors))"))))
-               ;; Remove the extraneous subdirs.el file, as it causes Emacs to
-               ;; add recursively all the the sub-directories of a profile's
-               ;; share/emacs/site-lisp union when added to EMACSLOADPATH,
-               ;; which leads to conflicts.
-               (delete-file (string-append lisp-dir "/subdirs.el"))
-               ;; Byte compile the site-start files.
-               (emacs-byte-compile-directory lisp-dir))
-             #t))
-         (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp
-           ;; restore the dump file that Emacs installs somewhere in
-           ;; libexec/ to its original state
-           (lambda* (#:key outputs target #:allow-other-keys)
-             (let* ((libexec (string-append (assoc-ref outputs "out")
-                                            "/libexec"))
-                    ;; each of these ought to only match a single file,
-                    ;; but even if not (find-files) sorts by string<,
-                    ;; so the Nth element in one maps to the Nth element of
-                    ;; the other
-                    (pdmp (find-files libexec "\\.pdmp$"))
-                    (pdmp-real (find-files libexec "\\.pdmp-real$")))
-               (for-each rename-file pdmp-real pdmp))))
-         (add-after 'glib-or-gtk-wrap 'strip-double-wrap
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped
-             ;; twice.  This also fixes a minor issue, where WMs would not be
-             ;; able to track emacs back to emacs.desktop.
-             (with-directory-excursion (assoc-ref outputs "out")
-               (copy-file
-                (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
-                "bin/emacs")
-               #t)))
-         (add-after 'strip-double-wrap 'wrap-emacs-paths
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (lisp-dirs (find-files (string-append out "/share/emacs")
-                                           "^lisp$"
-                                           #:directories? #t)))
-               (for-each
-                (lambda (prog)
-                  (wrap-program prog
-                    ;; emacs-next and variants rely on uname being in PATH for
-                    ;; Tramp.  Tramp paths can't be hardcoded, because they
-                    ;; need to be portable.
-                    `("PATH" suffix
-                      ,(map (lambda (in) (string-append in "/bin"))
-                            (list (assoc-ref inputs "gzip")
-                                  (assoc-ref inputs "coreutils"))))
-                    `("EMACSLOADPATH" suffix ,lisp-dirs)))
-                (find-files (string-append out "/bin")
-                            ;; Matches versioned and unversioned emacs binaries.
-                            ;; We don't patch emacsclient, because it takes its
-                            ;; environment variables from emacs.
-                            ;; Likewise, we don't need to patch helper binaries
-                            ;; like etags, ctags or ebrowse.
-                            "^emacs(-[0-9]+(\\.[0-9]+)*)?$"))))))))
-    (inputs
-     `(("gnutls" ,gnutls)
-       ("ncurses" ,ncurses)
-
-       ;; Required for "core" functionality, such as dired and compression.
-       ("coreutils" ,coreutils)
-       ("gzip" ,gzip)
-
-       ;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
-       ;; only via insecure channels.  This is not needed for (modern) IMAP.
-       ("mailutils" ,mailutils)
-
-       ;; TODO: Add the optional dependencies.
-       ("gpm" ,gpm)
-       ("libx11" ,libx11)
-       ("gtk+" ,gtk+)
-       ("cairo" ,cairo)
-       ("pango" ,pango)
-       ("harfbuzz" ,harfbuzz)
-       ("libxft" ,libxft)
-       ("libtiff" ,libtiff)
-       ("giflib" ,giflib)
-       ("libjpeg" ,libjpeg-turbo)
-       ("acl" ,acl)
-       ("jansson" ,jansson)
-       ("gmp" ,gmp)
-       ("ghostscript" ,ghostscript)
-       ("poppler" ,poppler)
-
-       ;; When looking for libpng `configure' links with `-lpng -lz', so we
-       ;; must also provide zlib as an input.
-       ("libpng" ,libpng)
-       ("zlib" ,zlib)
-       ("librsvg" ,@(if (target-x86-64?)
-                         (list librsvg-bootstrap)
-                         (list librsvg-2.40)))
-       ("libxpm" ,libxpm)
-       ("libxml2" ,libxml2)
-       ("libice" ,libice)
-       ("libsm" ,libsm)
-       ("alsa-lib" ,alsa-lib)
-       ("dbus" ,dbus)
-
-       ;; multilingualization support
-       ("libotf" ,libotf)
-       ("m17n-lib" ,m17n-lib)))
-    (native-inputs
-     `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
-       ("pkg-config" ,pkg-config)
-       ("texinfo" ,texinfo)))
-
-    (native-search-paths
-     (list (search-path-specification
-            (variable "EMACSLOADPATH")
-            (files '("share/emacs/site-lisp")))
-           (search-path-specification
-            (variable "INFOPATH")
-            (files '("share/info")))))
-
-    (home-page "https://www.gnu.org/software/emacs/")
-    (synopsis "The extensible, customizable, self-documenting text editor")
-    (description
-     "GNU Emacs is an extensible and highly customizable text editor.  It is
-based on an Emacs Lisp interpreter with extensions for text editing.  Emacs
-has been extended in essentially all areas of computing, giving rise to a
-vast array of packages supporting, e.g., email, IRC and XMPP messaging,
-spreadsheets, remote server editing, and much more.  Emacs includes extensive
-documentation on all aspects of the system, from basic editing to writing
-large Lisp programs.  It has full Unicode support for nearly all human
-languages.")
-    (license license:gpl3+)))
-
-(define-public libgccjit-for-gcc
-  (mlambda (gcc)
-    (package
-      (inherit gcc)
-      (name "libgccjit")
-      (outputs (delete "lib" (package-outputs gcc)))
-      (properties (alist-delete 'hidden? (package-properties gcc)))
-      (arguments
-       (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system)
-                                                  (guix build utils)
-                                                  (ice-9 regex)
-                                                  (srfi srfi-1)
-                                                  (srfi srfi-26))
-                                       ,@(package-arguments gcc))
-         ((#:configure-flags flags)
-          `(append '("--disable-bootstrap"
-                     "--disable-libatomic"
-                     "--disable-libgomp"
-                     "--disable-libquadmath"
-                     "--disable-libssp"
-                     "--enable-host-shared"
-                     "--enable-checking=release"
-                     "--enable-languages=jit")
-                   (remove (cut string-match "--enable-languages.*" <>)
-                           ,flags)))
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'install 'remove-broken-or-conflicting-files
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (for-each delete-file
-                           (find-files (string-append (assoc-ref outputs "out") "/bin")
-                                       ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))
-                 #t))))))
-      (inputs
-       (alist-delete "libstdc++"
-                     (package-inputs gcc)))
-      (native-inputs
-       `(("gcc" ,gcc)
-         ,@(package-native-inputs gcc))))))
-
-(define-public libgccjit-10
-  (libgccjit-for-gcc gcc-10))
-
-(define-public libgccjit-11
-  (libgccjit-for-gcc gcc-11))
-
-(define-public emacs
-  (package
-   (inherit emacs)
-   (name "emacs")
-   (version "28.1")
-   (source
-    (origin
-     (method url-fetch)
-     (uri (string-append "mirror://gnu/emacs/emacs-"
-                         version ".tar.xz"))
-     (sha256
-      (base32
-       "1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98"))))
-   (arguments
-    (substitute-keyword-arguments
-     (package-arguments emacs-next)
-     ((#:configure-flags flags ''())
-      `(list "--with-imagemagick"
-             "--disable-silent-rules"
-             "--with-x-toolkit=no"
-             "--enable-link-time-optimization"
-             "--with-json"
-             "--with-jpeg"
-             "--with-png"
-             "--with-rsvg"
-             "--without-xaw3d"
-             "--with-threads"
-             "--with-included-regex"
-             "--with-modules"
-             "--without-libotf"
-             "--without-libsystemd"
-             "--with-mailutils"
-             "--without-toolkit-scroll-bars"
-             "--without-selinux"
-             ;; "--without-harfbuzz"
-             ;; "--without-cairo"
-             ;; "--with-libxft"
-             ;; "--with-xdbe=no"
-             "CFLAGS=-O3 -g -fcommon -pipe"
-             ))))
-   (inputs
-    (modify-inputs (package-inputs emacs-next)
-                   (prepend imagemagick libxaw)))
-   (properties '((tunable? . #true)))))
-
-(define-public emacs-with-native-compilation
-  (let ((libgccjit (libgccjit-for-gcc gcc-11)))
-    (package
-      (inherit emacs)
-      (name "emacs-with-native-compilation")
-      (version "28.1")
-      (source
-       (origin
-         (method url-fetch)
-         (uri (string-append "mirror://gnu/emacs/emacs-"
-                             version ".tar.xz"))
-         (sha256
-          (base32
-           "1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98"))))
-      (arguments
-       (substitute-keyword-arguments
-        (package-arguments emacs-28)
-        ((#:make-flags flags ''())
-                `(cons* "NATIVE_FULL_AOT=1" ,flags))
-         ((#:configure-flags flags ''())
-          `(cons* "--with-native-compilation"
-                  "CFLAGS=-O3 -g -fcommon -fcommon -pipe"
-                  ,flags))
-         ((#:phases phases ''())
-          `(modify-phases ,phases
-             ;; Required for configure to find libgccjit
-             (add-before 'configure 'set-library-path
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (let* ((libgccjit-version ,(package-version libgccjit))
-                        (libgccjit-libdir
-                         (string-append
-                          (assoc-ref inputs "libgccjit") "/lib/gcc/"
-                          %host-type "/" libgccjit-version "/")))
-                   (setenv "LIBRARY_PATH"
-                           (string-append libgccjit-libdir ":"
-                                          (getenv "LIBRARY_PATH"))))))
-             ;; Add runtime library paths for libgccjit.
-             (add-after 'unpack 'patch-driver-options
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (substitute* "lisp/emacs-lisp/comp.el"
-                   (("\\(defcustom native-comp-driver-options nil")
-                    (format
-                     #f "(defcustom native-comp-driver-options '(~s ~s ~s ~s)"
-                     (string-append
-                      "-B" (assoc-ref inputs "binutils") "/bin/")
-                     (string-append
-                      "-B" (assoc-ref inputs "glibc") "/lib/")
-                     (string-append
-                      "-B" (assoc-ref inputs "libgccjit") "/lib/")
-                     (string-append
-                      "-B" (assoc-ref inputs "libgccjit") "/lib/gcc/"))))))))))
-      (inputs
-       (modify-inputs (package-inputs emacs-28)
-                      (prepend libgccjit glibc bzip2)))
-      (propagated-inputs
-       (modify-inputs (package-inputs emacs-28)
-                      (prepend)))
-      (properties '((tunable? . #true))))))
-
-(define-public wkmacs
-  (package
-   (inherit emacs)
-   (name "wkmacs")
-   (version "28.1")
-   (propagated-inputs
-    (list emacs-flycheck
-      emacs-pdf-tools
-      emacs-debbugs
-      emacs-vimrc-mode
-      emacs-docker-compose-mode
-      emacs-dockerfile-mode
-      emacs-docker
-      emacs-org-roam
-      emacs-web-mode
-      emacs-php-mode
-      emacs-robe
-      emacs-inf-ruby
-      emacs-sudo-edit
-      emacs-auto-complete
-      emacs-visual-fill-column
-      emacs-dumb-jump
-      emacs-goto-chg
-      emacs-gitpatch
-      emacs-magit
-      emacs-auctex
-      emacs-anaconda-mode
-      emacs-anzu
-      emacs-all-the-icons
-      emacs-telega
-      emacs-geiser
-      emacs-org-webring
-      emacs-all-the-icons-dired
-      emacs-avy
-      emacs-browse-kill-ring
-      emacs-haskell-mode
-      emacs-idris-mode
-      emacs-mwim
-      emacs-diminish
-      emacs-direnv
-      emacs-elpher
-      emacs-exec-path-from-shell
-      emacs-expand-region
-      emacs-geiser-guile
-      emacs-guix
-      emacs-org-ref
-      emacs-git-gutter
-      emacs-gnuplot
-      emacs-nix-mode
-      emacs-sml-mode
-      emacs-slime
-      emacs-simple-httpd
-      emacs-undo-tree
-      emacs-yasnippet
-      emacs-yasnippet-snippets
-      emacs-xref))
-   (properties '((tunable? . #true)))))
-
 (define-public emacs-pythonic
   (package
@@ -666 +217 @@
     (list emacs-request))
    (build-system emacs-build-system)))
+
+(define-public emacs-mini-modeline
+  (package
+    (name "emacs-mini-modeline")
+    (version "20211130.604")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/kiennq/emacs-mini-modeline.git")
+                    (commit "434b98b22c69c8b3b08e9c267c935591c49a8301")))
+              (sha256
+               (base32
+                "063bpi3gxzi6kkc3mb9h4m8lvbsvfw47z559960h912h2l3z6vhq"))))
+    (build-system emacs-build-system)
+    (propagated-inputs (list emacs-dash))
+    (home-page "https://github.com/kiennq/emacs-mini-modeline")
+    (synopsis "Display modeline in minibuffer")
+    (description
+     "Display modeline in minibuffer.  With this we save one display line and also
+don't have to see redundant information.")
+    (license #f)))
+
+(define-public emacs-isearch-mb
+  (package
+    (name "emacs-isearch-mb")
+    (version "0.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://elpa.gnu.org/packages/isearch-mb-"
+                                  version ".tar"))
+              (sha256
+               (base32
+                "0fah8dmh9jv05i93ccn9dvl7qmfy32vwxqdzkf1v8gr1plsyjyx7"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/astoff/isearch-mb")
+    (synopsis "Control isearch from the minibuffer")
+    (description "")
+    (license license:gpl3+)))