<
aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/gnupg.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/gnupg.scm')
-rw-r--r--gnu/packages/gnupg.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index ebd89a2009..4564cb9453 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -570,14 +570,14 @@ decrypt messages using the OpenPGP format by making use of GPGME.")
(define-public python-gnupg
(package
(name "python-gnupg")
- (version "0.4.4")
+ (version "0.4.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "python-gnupg" version))
(sha256
(base32
- "03pvjyp6q9pr8qa22i38az06ddzhvzy5kj192hxa3gbhnchg1nj5"))))
+ "1isazrg2h126xg3vvk4wrhx8k8yfsg5sxybvfa99phj235mzaq90"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -595,7 +595,7 @@ decrypt messages using the OpenPGP format by making use of GPGME.")
"test_gnupg.py" "--no-doctests"))))))
(native-inputs
`(("gnupg" ,gnupg-1)))
- (home-page "https://packages.python.org/python-gnupg/index.html")
+ (home-page "https://pythonhosted.org/python-gnupg/index.html")
(synopsis "Wrapper for the GNU Privacy Guard")
(description
"This module allows easy access to GnuPG’s key management, encryption
generated by cgit
s grafts. ;; Run `make check-system TESTS=emacs-native-comp' to ensure that grafts ;; can meaningfully be applied. (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 (base32 "0dd2mh6maa7dc5f49qdzj7bi4hda4wfm1cvvgq560djcz537k2ds")) (patches (search-patches "emacs-disable-jit-compilation.patch" "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" "emacs-native-comp-fix-filenames.patch" "emacs-pgtk-super-key-fix.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.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\"") " "))))))) (build-system gnu-build-system) (arguments (list #:tests? #f ; no check target #:modules (%emacs-modules build-system) #:configure-flags #~(list "--with-gnutls=no" "--disable-build-details") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'enable-elogind (lambda _ (substitute* "configure.ac" (("libsystemd") "libelogind")) (when (file-exists? "configure") (delete-file "configure")))) (add-after 'unpack 'patch-program-file-names (lambda* (#:key inputs #:allow-other-keys) ;; Substitute "sh" command. (substitute* '("src/callproc.c" "lisp/term.el" "lisp/htmlfontify.el" "lisp/mail/feedmail.el" "lisp/obsolete/pgg-pgp.el" "lisp/obsolete/pgg-pgp5.el" "lisp/obsolete/terminal.el" "lisp/org/ob-eval.el" "lisp/textmodes/artist.el" "lisp/progmodes/sh-script.el" "lisp/textmodes/artist.el" "lisp/htmlfontify.el" "lisp/term.el") (("\"/bin/sh\"") (format #f "~s" (search-input-file inputs "bin/sh")))) (substitute* '("lisp/gnus/mm-uu.el" "lisp/gnus/nnrss.el" "lisp/mail/blessmail.el") (("\"#!/bin/sh\\\n\"") (format #f "\"#!~a~%\"" (search-input-file inputs "bin/sh")))) (substitute* '("lisp/jka-compr.el" "lisp/man.el") (("\"sh\"") (format #f "~s" (search-input-file inputs "bin/sh")))) ;; Substitute "awk" command. (substitute* '("lisp/gnus/nnspool.el" "lisp/org/ob-awk.el" "lisp/man.el") (("\"awk\"") (format #f "~s" (search-input-file inputs "bin/awk")))) ;; Substitute "find" command. (substitute* '("lisp/gnus/gnus-search.el" "lisp/obsolete/nnir.el" "lisp/progmodes/executable.el" "lisp/progmodes/grep.el" "lisp/filecache.el" "lisp/ldefs-boot.el" "lisp/mpc.el") (("\"find\"") (format #f "~s" (search-input-file inputs "bin/find")))) ;; Substitute "sed" command. (substitute* "lisp/org/ob-sed.el" (("org-babel-sed-command \"sed\"") (format #f "org-babel-sed-command ~s" (search-input-file inputs "bin/sed")))) (substitute* "lisp/man.el" (("Man-sed-command \"sed\"") (format #f "Man-sed-command ~s" (search-input-file inputs "bin/sed")))) (substitute* "lisp/doc-view.el" (("\"(gs|dvipdf|ps2pdf|pdftotext)\"" all what) (let ((replacement (false-if-exception (search-input-file inputs (string-append "/bin/" what))))) (if replacement (string-append "\"" replacement "\"") 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")))))) (add-after 'unpack 'disable-native-compilation (lambda _ ;; Temporary workaround to prevent the behaviour discussed in ;; <https://issues.guix.gnu.org/72333>. ;; Please remove once the native-compilation for Emacs packages ;; is fully supported. (substitute* "lisp/transient.el" ((";; End:") ";; no-native-compile: t ;; End:")))) (add-before 'configure 'fix-/bin/pwd (lambda _ ;; Use `pwd', not `/bin/pwd'. (substitute* (find-files "." "^Makefile\\.in$") (("/bin/pwd") "pwd")))) (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 #$(local-file (search-auxiliary-file "emacs/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 'no-reload)\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)))) (add-after 'install '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 ;; Some variants rely on uname being in PATH for Tramp. ;; Tramp paths can't be hardcoded, because they need to ;; be portable. `("PATH" suffix ,(map dirname (list (search-input-file inputs "/bin/gzip") ;; for coreutils (search-input-file inputs "/bin/yes")))) `("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]+)*)?$"))))) (add-after 'wrap-emacs-paths 'undo-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"))))))) (inputs (list bash-minimal coreutils findutils gawk gzip ncurses sed)) (native-inputs (list autoconf pkg-config texinfo)) (home-page "https://www.gnu.org/software/emacs/") (synopsis "The extensible text editor (minimal build for byte-compilation)") (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+) (native-search-paths (list (search-path-specification (variable "EMACSLOADPATH") (files '("share/emacs/site-lisp"))) (search-path-specification (variable "EMACSNATIVELOADPATH") (files '("lib/emacs/native-site-lisp"))) (search-path-specification (variable "INFOPATH") (files '("share/info"))) ;; Most variants support tree-sitter, so let's include it here. (search-path-specification (variable "TREE_SITTER_GRAMMAR_PATH") (files '("lib/tree-sitter"))))) (properties `((upstream-name . "emacs"))))) (define-public emacs-no-x (package/inherit emacs-minimal (name "emacs-no-x") (synopsis "The extensible, customizable, self-documenting text editor (console only)") (arguments (substitute-keyword-arguments (package-arguments emacs-minimal) ((#:configure-flags flags #~'()) #~(cons* "--with-modules" "--with-native-compilation=aot" (delete "--with-gnutls=no" #$flags))) ((#:phases phases) #~(modify-phases #$phases (add-after 'set-paths 'set-libgccjit-path (lambda* (#:key inputs #:allow-other-keys) (define (first-subdirectory/absolute directory) (let ((files (scandir directory (lambda (file) (and (not (member file '("." ".."))) (file-is-directory? (string-append directory "/" file))))))) (and (not (null? files)) (string-append directory "/" (car files))))) (let* ((libgccjit-libdir (first-subdirectory/absolute ;; version (first-subdirectory/absolute ;; host type (search-input-directory inputs "lib/gcc"))))) (setenv "LIBRARY_PATH" (string-append (getenv "LIBRARY_PATH") ":" libgccjit-libdir))))) (add-after 'unpack 'patch-compilation-driver (lambda _ (substitute* "lisp/emacs-lisp/comp.el" (("\\(defcustom native-comp-driver-options nil") (format #f "(defcustom native-comp-driver-options '(~@{~s~^ ~})" (string-append "-B" #$(this-package-input "binutils") "/bin/") (string-append "-B" #$(this-package-input "glibc") "/lib/") (string-append "-B" #$(this-package-input "libgccjit") "/lib/") (string-append "-B" #$(this-package-input "libgccjit") "/lib/gcc/")))))) (add-after 'build 'build-trampolines (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "trampolines" make-flags))) (add-after 'validate-runpath 'validate-comp-integrity (lambda* (#:key outputs #:allow-other-keys) #$(cond ((%current-target-system) #~(display "Cannot validate native-comp on cross builds.\n")) ((member (%current-system) '("armhf-linux" "i686-linux")) #~(display "Integrity test is broken on armhf.\n")) (else #~(invoke (string-append (assoc-ref outputs "out") "/bin/emacs") "--batch" "--load" #$(local-file (search-auxiliary-file "emacs/comp-integrity.el")) "-f" "ert-run-tests-batch-and-exit"))))))))) (inputs (modify-inputs (package-inputs emacs-minimal) (prepend gnutls ;; To "unshadow" ld-wrapper in native builds (make-ld-wrapper "ld-wrapper" #:binutils binutils) ;; For native compilation binutils (libc-for-target) libgccjit ;; Avoid Emacs's limited movemail substitute that retrieves POP3 ;; email only via insecure channels. ;; This is not needed for (modern) IMAP. mailutils acl alsa-lib elogind ghostscript gpm jansson lcms libice libselinux libsm libxml2 m17n-lib sqlite tree-sitter zlib))))) (define-public emacs (package/inherit emacs-no-x (name "emacs") (synopsis "The extensible, customizable, self-documenting text editor") (build-system glib-or-gtk-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs-no-x) ((#:modules _) (%emacs-modules build-system)) ((#:configure-flags flags #~'()) #~(cons* "--with-cairo" #$flags)) ((#:phases phases) #~(modify-phases #$phases ;; Note: due to the changed #:modules, %standard-phases in #$phases ;; refers to glib-or-gtk:%standard-phases, so we don't need to add ;; them ourselves. (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)))))))) (inputs (modify-inputs (package-inputs emacs-no-x) (prepend cairo dbus gtk+ giflib harfbuzz libjpeg-turbo libotf libpng (librsvg-for-system) libtiff libx11 libxft libxpm pango poppler))))) (define-public emacs-pgtk (package/inherit emacs (name "emacs-pgtk") (arguments (substitute-keyword-arguments (package-arguments emacs) ((#:configure-flags flags #~'()) #~(cons* "--with-pgtk" #$flags)))) (synopsis "Emacs text editor with @code{pgtk} frames") (description "This Emacs build implements graphical UI purely in terms of GTK."))) (define-public emacs-xwidgets (package/inherit emacs (name "emacs-xwidgets") (synopsis "The extensible, customizable, self-documenting text editor (with xwidgets support)") (arguments (substitute-keyword-arguments (package-arguments emacs) ((#:configure-flags flags #~'()) #~(cons "--with-xwidgets" #$flags)))) (inputs (modify-inputs (package-inputs emacs) (prepend webkitgtk-with-libsoup2 libxcomposite))))) (define-public emacs-pgtk-xwidgets (package (inherit emacs-pgtk) (name "emacs-pgtk-xwidgets") (synopsis "Emacs text editor with @code{xwidgets} and @code{pgtk} support") (arguments (substitute-keyword-arguments (package-arguments emacs-pgtk) ((#:configure-flags flags #~'()) #~(cons "--with-xwidgets" #$flags)))) (inputs (modify-inputs (package-inputs emacs-pgtk) (prepend gsettings-desktop-schemas webkitgtk-with-libsoup2))))) (define-public emacs-motif (package/inherit emacs-no-x (name "emacs-motif") (synopsis "The extensible, customizable, self-documenting text editor (with Motif toolkit)") ;; Using emacs' inputs as base, since it has all the graphical stuff (inputs (modify-inputs (package-inputs emacs) (delete "gtk+") (prepend inotify-tools motif))) (arguments (substitute-keyword-arguments (package-arguments emacs-no-x) ((#:configure-flags flags #~'()) #~(cons "--with-x-toolkit=motif" #$flags)))))) (define-public emacs-no-x-toolkit (package/inherit emacs-no-x (name "emacs-no-x-toolkit") (synopsis "The extensible, customizable, self-documenting text editor (without an X toolkit)" ) ;; Using emacs' inputs as base, since it has all the graphical stuff (inputs (modify-inputs (package-inputs emacs) (delete "gtk+") (prepend inotify-tools))) (arguments (substitute-keyword-arguments (package-arguments emacs-no-x) ((#:configure-flags flags #~'()) #~(cons "--with-x-toolkit=no" #$flags)))))) (define-public emacs-wide-int (package/inherit emacs (name "emacs-wide-int") (synopsis "The extensible, customizable, self-documenting text editor (with wide ints)" ) (arguments (substitute-keyword-arguments (package-arguments emacs) ((#:configure-flags flags) #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal (let ((commit "4e22ef870c4b650f29c4441ac51b6a2ac506ea57") (revision "1")) (package (inherit emacs-minimal) (name "emacs-next-minimal") (version (git-version "30.0.60" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://git.savannah.gnu.org/git/emacs.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "1zl9ffj3ph4msr1r4qw09x1wljpv2lbr7ypqd0p3q89m2qpvfn80")) (patches (search-patches "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-next-native-comp-driver-options.patch" "emacs-pgtk-super-key-fix.patch"))))))) (define* (emacs->emacs-next emacs #:optional name #:key (version (package-version emacs-next-minimal)) (source (package-source emacs-next-minimal))) (package (inherit emacs) (name (or name (and (string-prefix? "emacs" (package-name emacs)) (string-append "emacs-next" (string-drop (package-name emacs) (string-length "emacs")))))) (version version) (source source) (arguments (substitute-keyword-arguments (package-arguments emacs) ((#:phases phases) #~(modify-phases #$phases (replace 'validate-comp-integrity (lambda* (#:key outputs #:allow-other-keys) #$(cond ((%current-target-system) #~(display "Cannot validate native compilation on cross builds.\n")) ((member (%current-system) '("armhf-linux" "i686-linux")) #~(display "Integrity test is broken on 32 bit systems.\n")) (else #~(invoke (string-append (assoc-ref outputs "out") "/bin/emacs") "--batch" "--load" #$(local-file (search-auxiliary-file "emacs/comp-integrity-next.el")) "-f" "ert-run-tests-batch-and-exit"))))))))))) (define-public emacs-next (emacs->emacs-next emacs)) (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk)) (define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets)) (define-public emacs-next-tree-sitter (deprecated-package "emacs-next-tree-sitter" emacs-next)) (define-public guile-emacs (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") (revision "0")) (package (inherit emacs) (name "guile-emacs") (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://git.hcoop.net/git/bpt/emacs.git") (commit commit))) (file-name (git-file-name name version)) (patches (search-patches "guile-emacs-fix-configure.patch")) (sha256 (base32 "0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6")))) (native-inputs (modify-inputs (package-native-inputs emacs) (prepend autoconf automake guile-for-guile-emacs))) (arguments (substitute-keyword-arguments `(;; Build fails if we allow parallel build. #:parallel-build? #f ;; Tests aren't passing for now. #:tests? #f ,@(package-arguments emacs)) ((#:configure-flags flags ''()) #~(delete "--with-cairo" #$flags)) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'autogen (lambda _ (invoke "sh" "autogen.sh"))) ;; Build sometimes fails: deps/dispnew.d: No such file or directory (add-before 'build 'make-deps-dir (lambda _ (invoke "mkdir" "-p" "src/deps"))) (delete 'restore-emacs-pdmp) (delete 'strip-double-wrap)))))))) (define-public m17n-db (package (name "m17n-db") (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/m17n/m17n-db-" version ".tar.gz")) (sha256 (base32 "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal))) (arguments `(#:configure-flags (list (string-append "--with-charmaps=" (assoc-ref %build-inputs "libc") "/share/i18n/charmaps")))) ;; With `guix lint' the home-page URI returns a small page saying ;; that your browser does not handle frames. This triggers the "URI ;; returns suspiciously small file" warning. (home-page "https://www.nongnu.org/m17n/") (synopsis "Multilingual text processing library (database)") (description "The m17n library realizes multilingualization of many aspects of applications. The m17n library represents multilingual text as an object named M-text. M-text is a string with attributes called text properties, and designed to substitute for string in C. Text properties carry any information required to input, display and edit the text. This package contains the library database.") (license license:lgpl2.1+))) (define-public m17n-lib (package (name "m17n-lib") (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/m17n/m17n-lib-" version ".tar.gz")) (sha256 (base32 "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq")) (patches (search-patches "m17n-lib-1.8.0-use-pkg-config-for-freetype.patch")))) (build-system gnu-build-system) (native-inputs (if (%current-target-system) (list pkg-config libtool gettext-minimal autoconf automake) '())) (inputs (list fribidi gd libotf libxft libxml2 m17n-db)) (arguments `(#:parallel-build? #f ,@(if (%current-target-system) '(#:phases (modify-phases %standard-phases ;; AC_FUNC_MALLOC and AC_FUNC_REALLOC usually unneeded ;; see https://lists.gnu.org/archive/html/autoconf/2003-02/msg00017.html (add-after 'unpack 'fix-rpl_malloc (lambda _ (substitute* "configure.ac" (("AC_FUNC_MALLOC") "") (("AC_FUNC_REALLOC") "")) ;; let bootstrap phase run. (delete-file "./configure"))))) '()))) ;; With `guix lint' the home-page URI returns a small page saying ;; that your browser does not handle frames. This triggers the "URI ;; returns suspiciously small file" warning. (home-page "https://www.nongnu.org/m17n/") (synopsis "Multilingual text processing library (runtime)") (description "The m17n library realizes multilingualization of many aspects of applications. The m17n library represents multilingual text as an object named M-text. M-text is a string with attributes called text properties, and designed to substitute for string in C. Text properties carry any information required to input, display and edit the text. This package contains the library runtime.") (license license:lgpl2.1+)))
generated by cgit