mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-17 04:20:44 +02:00
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm
This commit is contained in:
commit
8d59c262ad
176 changed files with 16041 additions and 6439 deletions
|
@ -59,7 +59,7 @@
|
|||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages linux) ; alsa-lib
|
||||
#:use-module (gnu packages linux) ; alsa-lib, gpm
|
||||
#:use-module (gnu packages mail) ; for mailutils
|
||||
#:use-module (gnu packages multiprecision)
|
||||
#:use-module (gnu packages ncurses)
|
||||
|
@ -248,6 +248,7 @@
|
|||
("mailutils" ,mailutils)
|
||||
|
||||
;; TODO: Add the optional dependencies.
|
||||
("gpm" ,gpm)
|
||||
("libx11" ,libx11)
|
||||
("gtk+" ,gtk+)
|
||||
("cairo" ,cairo)
|
||||
|
@ -311,7 +312,8 @@ languages.")
|
|||
(define-public emacs-next
|
||||
(let ((commit "2ea34662c20f71d35dd52a5ed996542c7386b9cb")
|
||||
(revision "0"))
|
||||
(package/inherit emacs
|
||||
(package
|
||||
(inherit emacs)
|
||||
(name "emacs-next")
|
||||
(version (git-version "28.0.50" revision commit))
|
||||
(source
|
||||
|
@ -332,7 +334,8 @@ languages.")
|
|||
(define-public emacs-next-pgtk
|
||||
(let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2")
|
||||
(revision "1"))
|
||||
(package/inherit emacs-next
|
||||
(package
|
||||
(inherit emacs-next)
|
||||
(name "emacs-next-pgtk")
|
||||
(version (git-version "28.0.50" revision commit))
|
||||
(source
|
||||
|
@ -456,7 +459,8 @@ editor (with wide ints)" )
|
|||
(define-public guile-emacs
|
||||
(let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
|
||||
(revision "0"))
|
||||
(package/inherit emacs
|
||||
(package
|
||||
(inherit emacs)
|
||||
(name "guile-emacs")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue